Clean up for submission