removed a bunch of controls not being used