classif cleanup