diff --git a/src/engine/init.c b/src/engine/init.c
index 12035f3e378..0111e3c1540 100644
--- a/src/engine/init.c
+++ b/src/engine/init.c
@@ -829,12 +829,8 @@ server_init(int argc, char *argv[])
 exit_mod_loaded:
 	ds_iv_fini();
 	dss_module_unload_all();
-	if (dss_mod_facs & DSS_FAC_LOAD_CLI) {
-		daos_fini();
-	} else {
-		pl_fini();
-		daos_hhash_fini();
-	}
+	pl_fini();
+	daos_hhash_fini();
 exit_crt:
 	crt_finalize();
 exit_mod_init:
@@ -889,12 +885,8 @@ server_fini(bool force)
 	 * Client stuff finalization needs be done after all ULTs drained
 	 * in dss_srv_fini().
 	 */
-	if (dss_mod_facs & DSS_FAC_LOAD_CLI) {
-		daos_fini();
-	} else {
-		pl_fini();
-		daos_hhash_fini();
-	}
+	pl_fini();
+	daos_hhash_fini();
 	D_INFO("daos_fini() or pl_fini() done\n");
 	crt_finalize();
 	D_INFO("crt_finalize() done\n");
diff --git a/src/include/daos/rsvc.h b/src/include/daos/rsvc.h
index 23ecf35e52f..95d96f5d95c 100644
--- a/src/include/daos/rsvc.h
+++ b/src/include/daos/rsvc.h
@@ -14,8 +14,6 @@
 
 #include <daos_types.h>
 
-#define RECHOOSE_SLEEP_MS 250
-
 /** Flags in rsvc_hint::sh_flags (opaque) */
 enum rsvc_hint_flag {
 	RSVC_HINT_VALID	= 1	/* sh_term and sh_rank contain valid info */