PDIO-80 #comment Clean up