Touch events: switch from add to setup and add teardown for events