Removed obsolete state values