- Used feedback from MSCHWERN / Bug #22074 to cleanup new/_pre_submit more