mostly comment cleanup