Clean up to prepare for submission