Clean up
Improved player input handling
Revert "Improved player input handling"

This reverts commit ada111d08ab58e206b80394681817d991542fe23.
ASdsdfsdf fuyck