Cleaning of some classes and files