more touch-handling cleanup