Project Cleanup, removing all not used classes and code