Final finishes for DB refactoring (Phases)