That's phase 2, let's *please* fully validate/deploy these 5000+ lines removed first.