Phase 2 - Platform simplifications.