Code Cleanup prior to redesign

Removed all unused code and rolled back a number of changes in
preparation for a major redesign