Import cleanups
Don't use Set.contains() to determine if EntityDictionary exists.