Refactor touch logic and remove controls for testing