PDIO-398 Further cleanup on storage