SI-7681 Remove Phases, clean up TableDef