Cleaned up teleop calls in prep for merging with joystick