Fix touch action and remove dead code