Expansions cleanup, removed some out of era or unnecessary code.