Basically removed a *lot* of stuff...

...that's unnecessary.