with classifier cleaned up