cleanup of some comments