general clean up and removal of some site specific code