Revert "Joysticks Fix"

This reverts commit d11c804b4ba2c2c86669ca6ea42472f553cfd534.
Revert "Joysticks, cleaning, and bugs"

This reverts commit 28073903f9274c270705cef2103e97e64671d035.