Re-added removal of NRRD