clean up macJoystick to work with base t2d