Squash into remove-joysticks commit
joystick update