More Player Control Tweaks

Removed a script, cut down the code and optimized a bit.