Major cleanup, support for 24.4 pretest