classif cleanup again