diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml
index 3404b2720..34ad0fab9 100644
--- a/services/pddb/Cargo.toml
+++ b/services/pddb/Cargo.toml
@@ -80,13 +80,7 @@ precursor = ["utralib/precursor", "sha2/precursor", "gen1"]
 hosted = ["utralib/hosted", "sha2/hosted", "gen1"]
 renode = ["utralib/renode", "sha2/renode", "gen1"]
 cramium-soc = ["utralib/cramium-soc", "gen2", "cram-hal-service"]
-hosted-baosec = [
-    "gen2",
-    "modals/hosted-baosec",
-    "cramium-emu",
-    "ux-api/hosted-baosec",
-    "cramium-api",
-]
+hosted-baosec = ["gen2", "cramium-emu", "cramium-api"]
 
 # gen1 PDDB pulls in the graphical libraries for direct capture of passwords
 # from users. This gives maximum control over the flow of sensitive password data,
@@ -111,9 +105,9 @@ gen1 = [
 ]
 
 # gen-2 features
-gen2 = ["keystore", "xous-swapper"]
+gen2 = ["keystore"]
 # gen-2 boards
-board-baosec = ["ux-api/board-baosec", "cramium-api", "gen2"]
+board-baosec = ["ux-api/board-baosec", "cramium-api", "gen2", "xous-swapper"]
 
 # when selected, physical disk addresses are set to 64 bits, otherwise, they are 32 bits.
 # 32 bit addressing is recommended for Precursor, as its disk is only 128MiB and it has limited RAM for bookkeeping.