removed unnecessary code and changed some minor stuff in the control class. removal of legacy code will continue so that refactoring can begin