Fix touch events
Remove comments