Cleanup, I know I should have done this in multiple commits

* use statements
* fixed some PHPDoc
* refactored some tiny bits
* removed unused stuff
* ...
* magic...