HRD cleanup