Comment Cleanup for Submission