replace buggy classifier
remove comments