IClassifer cleanup