some cleanup for move for submission.