Merge "TextClassifier cleanup #1"