testing multi-touch
Remove some old cruft