Removed the singleton storage of state from the SchemaUtil class.