cleanup
Removed things, which have to be rewritten