(Issue 710) Clean up some comments