Removed show/hide of controls, controls were often disappearing before they could be clicked
Removed unused functions