Clean up mess...

But should clean more and more... :(