Straighten data schema, remove unused models