UCJEPS-365: Clean up of 2.4 configuration overlays.