cleanup of models and schema, one big refactor pending