Cleaning of classes