Merge "Remove InputClassifier from current compatibility"