Major database simplification