Merge "Remove unused code from DictionaryFactory"