Removed clone requirement from State. Will eventually remove clone
requirement everywhere.