Milestone 3 post-submission cleanup