Cleaning some classes and directories