did some clean up in the schema