PDIO-230 Remove unused functions