pre-submission clean-up