diff --git a/workspace/00_get_data.Rmd b/workspace/00_get_data.Rmd
index 55df5077ba241e3395e38e688c40a59838b64759..328abe76df71eb751cd4101830298d1395301e30 100644
--- a/workspace/00_get_data.Rmd
+++ b/workspace/00_get_data.Rmd
@@ -49,7 +49,7 @@ if(!file.exists(hu12_points_path)) {
   if(is.null(sbtools::current_session()))
     sb <- authenticate_sb()
   
-  sbtools::item_file_download("60cb5edfd34e86b938a373f4", names = "102020wbd_outlets.gpkg", 
+  sbtools::item_file_download("63cb38b2d34e06fef14f40ad", names = "102020wbd_outlets.gpkg", 
                               destinations = hu12_points_path, session = sb)
 }
 
@@ -470,32 +470,6 @@ if(!file.exists(file.path(islands_dir, "hi.gpkg"))) {
 out_list <- c(out_list, out_hi)
 ```
 
-```{r e2nhd}
-
-zip_file <- "e2nhdplusv2_us_csv.zip"
-out_csv <- "e2nhdplusv2_us.csv"
-
-out_zip <- file.path(data_dir, out_csv)
-
-out <- list(e2nhd_network = file.path(data_dir, out_csv))
-
-if(!file.exists(out$e2nhd_network)) {
-  
-  if(is.null(sbtools::current_session()))
-    authenticate_sb()
-
-  sbtools::item_file_download("5d16509ee4b0941bde5d8ffe",
-                              names = zip_file,
-                              destinations = file.path(data_dir, zip_file))
-
-  zip::unzip(file.path(data_dir, zip_file), exdir = data_dir)
-
-}
-
-out_list <- c(out_list, out)
-
-```
-
 ```{r nwm_topology}
 nwm_targz_url <- "https://www.nohrsc.noaa.gov/pub/staff/keicher/NWM_live/NWM_parameters/NWM_parameter_files_v2.1.tar.gz"
 nwm_parm_url <- "https://www.nohrsc.noaa.gov/pub/staff/keicher/NWM_live/web/data_tools/NWM_v2.1_channel_hydrofabric.tar.gz"
@@ -534,13 +508,13 @@ out_list <- c(out_list, out)
 
 ```{r nhdplus_attributes}
 
-out <- list(new_nhdp_atts = file.path("cache", (sb_f <- "enhd_nhdplusatts.csv")))
+out <- list(new_nhdp_atts = file.path("data", (sb_f <- "enhd_nhdplusatts.csv")))
 
 if(!file.exists(out$new_nhdp_atts)) {
   if(is.null(sbtools::current_session()))
     authenticate_sb()
 
-  sbtools::item_file_download("60c92503d34e86b9389df1c9",
+  sbtools::item_file_download("63cb311ed34e06fef14f40a3",
                               names = sb_f,
                               destinations = out$new_nhdp_atts)
 }
@@ -548,22 +522,6 @@ if(!file.exists(out$new_nhdp_atts)) {
 out_list <- c(out_list, out)
 ```
 
-```{r nwm_nhdplus_attributes}
-
-out <- list(new_nwm_nhdp_atts = file.path("cache", (sb_f <- "nwm_enhd_nhdplusatts.csv")))
-
-if(!file.exists(out$new_nwm_nhdp_atts)) {
-  if(is.null(sbtools::current_session()))
-    authenticate_sb()
-
-  sbtools::item_file_download("60c92503d34e86b9389df1c9",
-                              names = sb_f,
-                              destinations = out$new_nwm_nhdp_atts)
-}
-
-out_list <- c(out_list, out)
-```
-
 ```{r GFv1.1}
 GFv11_dir <- file.path(data_dir, "GFv11")
 out <- list(GFv11_gages_lyr = file.path(data_dir, "GFv11/GFv11_gages.rds"),
@@ -640,6 +598,7 @@ if(!file.exists(out$ref_flowline)) {
     staged_nhd <- stage_national_data(nhdplus_data = out_list$nhdplus_gdb,
                                       output_path  = out_list$nhdplus_dir)
     
+    future::plan(future::multisession(workers = 16))
     # This will generate 
     fix_headwaters(staged_nhd$flowline, 
                    out$ref_flowline,
diff --git a/workspace/cache/data_paths.json b/workspace/cache/data_paths.json
index 15e755b4e772486d72c367edf79453d5f1c248a9..766abadf53d6f89ce77f9e57aae2fa2bbb3d1aab 100644
--- a/workspace/cache/data_paths.json
+++ b/workspace/cache/data_paths.json
@@ -247,11 +247,9 @@
   "merit_fac": "data/merged_AK_MERIT_Hydro/ak_merit_fac.tif",
   "ak_source": "data/AK/ak.gpkg",
   "hi_source": "data/islands/hi.gpkg",
-  "e2nhd_network": "data/e2nhdplusv2_us.csv",
   "nwm_network": "data/NWM_parameters_v2.1/RouteLink_CONUS.nc",
   "nwm_parm": "data/NWM_v2.1_channel_hydrofabric_10262020/nwm_v2_1_hydrofabric.gdb",
-  "new_nhdp_atts": "cache/enhd_nhdplusatts.csv",
-  "new_nwm_nhdp_atts": "cache/nwm_enhd_nhdplusatts.csv",
+  "new_nhdp_atts": "data/enhd_nhdplusatts.csv",
   "GFv11_gages_lyr": "data/GFv11/GFv11_gages.rds",
   "GFv11_gdb": "data/GFv11/GFv1.1.gdb",
   "GFv11_tgf": "data/GFv11/TGF.gdb",