Rework DB design, trimming down to the base