Post-submission tidy up