SI-6811 Remove Phases, clean up TableDef