Pre submit cleanup

MT, please double-check