Removes around 50 lines of code, one completly unecessary class and makes the code paths easier to understand.
