Switched to no root motion animation, cleaned up controller code