Major cleanout of installation specific code