Removed states, completed move code