Remove test/keyboard support, add joystick support.