slight clean up of schemas and config