Remove useless classifiers and add more useful classifiers