Xbox-Gamepad: Update and cleanup