progress towards removing 2.x warning infrastructure