SSP-1907 and SSP-1904 Fair amount of code cleanup, removal of Classes that are no longer used, tests are working