Remove dependency on ATVocabularyManager.