bit of cleanup of schema.xml, preparing for merger to develop branch