Cleaning of some classes