Change incorrect enum values, remove unused Joystick enum