Merge "TextClassifier cleanup."