PDIO-163 #comment cleanup