A LOT more cleanup again

And this is not over yet, very, very far from it!