Remove a shitload of stuff, probably break half the world
Now it's just as bad as it was before, except with a lot less code!