Cleaning the code and removing useless classes