Submission final cleanup