F39 Change Proposal: Retire Modularity (Self Contained)