diff --git a/workspace/00_get_data.Rmd b/workspace/00_get_data.Rmd
index 944578662f6238d416e219b06264982306c4b7b6..8d9fcb9e704c854d781d7dadead47b6bb2d80066 100644
--- a/workspace/00_get_data.Rmd
+++ b/workspace/00_get_data.Rmd
@@ -39,7 +39,9 @@ if(is(check_7z, "try-error")) {
   sevenz <- "bin/7za.exe"
 }
 
-initialize_sciencebase_session(username = Sys.getenv("sb_user"))
+if(!sbtools::is_logged_in())
+  initialize_sciencebase_session(username = Sys.getenv("sb_user"))
+
 # Enable mapview rendering if desired
 mapview <- FALSE
 ```
@@ -51,12 +53,15 @@ national modeling fabrics.
 #  Blodgett, D.L., 2022, Mainstem Rivers of the Conterminous United States: 
 #  U.S. Geological Survey data release, https://doi.org/10.5066/P9BTKP3T. 
 
+wbd_points_file <- "102020wbd_outlets.gpkg"
+
+get_sb_file(item = "63cb38b2d34e06fef14f40ad",
+                     item_files = wbd_points_file,
+                     out_destination = data_dir)
+
 out_list <- c(
   out_list, 
-  list(hu12_points_path = 
-         get_sb_file(item = "63cb38b2d34e06fef14f40ad",
-                     item_files = "102020wbd_outlets.gpkg",
-                     out_destination = data_dir)))
+  list(hu12_points_path = file.path(data_dir, wbd_points_file)))
 
 if(mapview)(mapview(read_sf(out_list$hu12_points_path)))
 
diff --git a/workspace/cache/data_paths.json b/workspace/cache/data_paths.json
index 515f3d201042ce7fc440cddf0fd7f51827535a3f..e0bdc4e7382455ac768b9680c878edd052179f8f 100644
--- a/workspace/cache/data_paths.json
+++ b/workspace/cache/data_paths.json
@@ -14,8 +14,6 @@
   "ref_cat": "data/reference_fabric/reference_catchments.gpkg",
   "ref_fl": "data/reference_fabric/reference_flowline.gpkg",
   "nwm_fl": "data/reference_fabric/nwm_network.gpkg",
-  "VAA_fst": "data/NHDPlusNationalData/nhdplusVAA.fst",
-  "VAA_rds": "data/NHDPlusNationalData/nhd_vaa.rds",
   "waterbodies_path": "data/NHDPlusNationalData/nhdplus_waterbodies.rds",
   "fullcats_table": "data/NHDPlusNationalData/nhdcat_full.rds",
   "islandcats_table": "data/islands/nhdcat_full.rds",
@@ -244,7 +242,6 @@
     "rpu_12c": "data/nhdplusv2_elev/NHDPlusTX/NHDPlus12/NEDSnapshot/NED12c/elev_cm",
     "rpu_12d": "data/nhdplusv2_elev/NHDPlusTX/NHDPlus12/NEDSnapshot/NED12d/elev_cm"
   },
-  "latest_wbd_rds": "data/wbd/WBD.rds",
   "merit_catchments": "data/merged_AK_MERIT_Hydro/merged_AK_MERIT_Hydro/cat_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp",
   "merit_rivers": "data/merged_AK_MERIT_Hydro/merged_AK_MERIT_Hydro/riv_pfaf_78_81_82_MERIT_Hydro_v07_Basins_v01.shp",
   "aster_dem": "data/merged_AK_MERIT_Hydro/dem.tif",
@@ -253,15 +250,13 @@
   "merit_fac": "data/merged_AK_MERIT_Hydro/ak_merit_fac.tif",
   "ak_source": "data/AK/ak.gpkg",
   "hi_source": "data/islands/hi.gpkg",
-  "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",
   "GFv11_gages_lyr": "data/GFv11/GFv11_gages.rds",
   "GFv11_gdb": "data/GFv11/GFv1.1.gdb",
   "GFv11_tgf": "data/GFv11/TGF.gdb",
   "gagesii_lyr": "data/SWIM_gage_loc/gagesII_9322_point_shapefile",
   "hilari_sites": "data/HILARRI/HILARRI_v2.csv",
+  "res_attributes": "data/reservoir_data/ResOpsUS/attributes/reservoir_attributes.csv",
   "istarf": "data/reservoir_data/ISTARF-CONUS.csv",
-  "istarf.1": "data/reservoir_data/ISTARF-CONUS.csv",
+  "GRanD": "data/reservoir_data/GRanD_Version_1_3",
   "resops_NID_CW": "data/reservoir_data/cw_ResOpsUS_NID.csv"
 }