Removed some extra copies of the state