diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 79fd8af034c2..df5c85fd2732 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -502,16 +502,11 @@
     },
     "@metamask/approval-controller": {
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/approval-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1147,8 +1142,8 @@
     },
     "@metamask/permission-controller": {
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
         "eth-rpc-errors": true,
@@ -1156,11 +1151,6 @@
         "json-rpc-engine": true
       }
     },
-    "@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1449,12 +1439,7 @@
     },
     "@metamask/subject-metadata-controller": {
       "packages": {
-        "@metamask/subject-metadata-controller>@metamask/base-controller": true
-      }
-    },
-    "@metamask/subject-metadata-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
+        "@metamask/base-controller": true
       }
     },
     "@ngraveio/bc-ur": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 492fac6829b3..adc6a4b47ce1 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -502,16 +502,11 @@
     },
     "@metamask/approval-controller": {
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/approval-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1159,8 +1154,8 @@
     },
     "@metamask/permission-controller": {
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
         "eth-rpc-errors": true,
@@ -1168,11 +1163,6 @@
         "json-rpc-engine": true
       }
     },
-    "@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1818,12 +1808,7 @@
     },
     "@metamask/subject-metadata-controller": {
       "packages": {
-        "@metamask/subject-metadata-controller>@metamask/base-controller": true
-      }
-    },
-    "@metamask/subject-metadata-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
+        "@metamask/base-controller": true
       }
     },
     "@ngraveio/bc-ur": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 79fd8af034c2..df5c85fd2732 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -502,16 +502,11 @@
     },
     "@metamask/approval-controller": {
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/approval-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1147,8 +1142,8 @@
     },
     "@metamask/permission-controller": {
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
         "eth-rpc-errors": true,
@@ -1156,11 +1151,6 @@
         "json-rpc-engine": true
       }
     },
-    "@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1449,12 +1439,7 @@
     },
     "@metamask/subject-metadata-controller": {
       "packages": {
-        "@metamask/subject-metadata-controller>@metamask/base-controller": true
-      }
-    },
-    "@metamask/subject-metadata-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
+        "@metamask/base-controller": true
       }
     },
     "@ngraveio/bc-ur": {
diff --git a/ui/pages/send/send-content/__snapshots__/send-content.component.test.js.snap b/ui/pages/send/send-content/__snapshots__/send-content.component.test.js.snap
index 255617fd51f2..db87fae1ea6e 100644
--- a/ui/pages/send/send-content/__snapshots__/send-content.component.test.js.snap
+++ b/ui/pages/send/send-content/__snapshots__/send-content.component.test.js.snap
@@ -236,27 +236,6 @@ exports[`SendContent Component render should match snapshot 1`] = `
                 <div
                   class="transaction-detail-item__detail-values"
                 >
-                  <h6
-                    class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h6 typography--weight-normal typography--style-normal typography--color-text-alternative"
-                  >
-                    <div
-                      class="box gas-display__currency-container box--flex-direction-row"
-                    >
-                      <div
-                        class="currency-display-component"
-                        title="0.0000315"
-                      >
-                        <span
-                          class="currency-display-component__prefix"
-                        />
-                        <span
-                          class="currency-display-component__text"
-                        >
-                          0.0000315
-                        </span>
-                      </div>
-                    </div>
-                  </h6>
                   <h6
                     class="box box--margin-top-1 box--margin-bottom-1 box--margin-left-1 box--flex-direction-row box--text-align-right typography typography--h6 typography--weight-bold typography--style-normal typography--color-text-default"
                   >