cleanup for submission