Cleans up after #34

removes obsolete OverridesInClassHierarchy, plugs in the UF by default in
expandSymbols