Clean up of code and uneeded classes