PDIO-398 Further cleanup