Completes the refactoring to full removal of the legacy architecture, 274 TODO tasks pending for MVP