Joystick - tidy code

Removed some stuff that was no longer needed.