Remove touchscreen device special case - see Issue #148
Remove touchscreen device special case - see Issue #148