PDI-9965 - hdp13 shim cleanup