Removing HM references