PDIO-398 Clean up deprecated API