Cleaning up for submission.