Clean up Button touch logic