big clean up of schema to match better the templates