Clean Up + AI Movement Update