Clean up comments now that they have a better home