diff --git a/src/app/features/settings-dropdown/settings-dropdown.tsx b/src/app/features/settings-dropdown/settings-dropdown.tsx
index 2d27eab08cf..1188917ce20 100644
--- a/src/app/features/settings-dropdown/settings-dropdown.tsx
+++ b/src/app/features/settings-dropdown/settings-dropdown.tsx
@@ -78,7 +78,6 @@ export function SettingsDropdown() {
               </MenuItem>
             </>
           )}
-          {/* // more importantly I broke tests again for direct access to receive I think  */}
           <MenuItem
             data-testid={SettingsSelectors.ToggleTheme}
             onClick={wrappedCloseCallback(() => {
diff --git a/src/app/pages/fund/fund.tsx b/src/app/pages/fund/fund.tsx
index 4075b89eb67..066cd80ca6e 100644
--- a/src/app/pages/fund/fund.tsx
+++ b/src/app/pages/fund/fund.tsx
@@ -27,9 +27,7 @@ export function FundPage({ children }: FundPageProps) {
   return (
     <>
       <FundLayout address={currentAccount.address} />
-      <>
-        <ModalBackgroundWrapper>{children}</ModalBackgroundWrapper>
-      </>
+      <ModalBackgroundWrapper>{children}</ModalBackgroundWrapper>
     </>
   );
 }
diff --git a/src/app/pages/receive/receive-modal.tsx b/src/app/pages/receive/receive-modal.tsx
index 0431877986f..8067883ac16 100644
--- a/src/app/pages/receive/receive-modal.tsx
+++ b/src/app/pages/receive/receive-modal.tsx
@@ -81,8 +81,7 @@ export function ReceiveModal({ type = 'full' }: ReceiveModalProps) {
                 onCopyAddress={() => copyToClipboard(onCopyBtc)}
                 onClickQrCode={() =>
                   navigate(`${RouteUrls.Home}${RouteUrls.ReceiveBtc}`, {
-                    // see if i need ...location.state
-                    state: { backgroundLocation, ...location.state },
+                    state: { backgroundLocation },
                   })
                 }
                 title="Bitcoin"
@@ -125,7 +124,7 @@ export function ReceiveModal({ type = 'full' }: ReceiveModalProps) {
               icon={<BtcStampsIcon />}
               onClickQrCode={() =>
                 navigate(`${RouteUrls.Home}${RouteUrls.ReceiveBtcStamp}`, {
-                  state: { backgroundLocation, ...location.state },
+                  state: { backgroundLocation },
                 })
               }
               onCopyAddress={() =>
@@ -139,7 +138,7 @@ export function ReceiveModal({ type = 'full' }: ReceiveModalProps) {
               onCopyAddress={() => copyToClipboard(onCopyStx, 'select_nft_to_add_new_collectible')}
               onClickQrCode={() =>
                 navigate(`${RouteUrls.Home}${RouteUrls.ReceiveStx}`, {
-                  state: { backgroundLocation, ...location.state },
+                  state: { backgroundLocation },
                 })
               }
               title="Stacks NFT"
@@ -147,9 +146,6 @@ export function ReceiveModal({ type = 'full' }: ReceiveModalProps) {
           </ReceiveItemList>
         </Box>
       </BaseDrawer>
-
-      {/* Outlet here for nested token routes */}
-      <Outlet />
     </>
   );
 }
diff --git a/src/app/pages/receive/receive-ordinal.tsx b/src/app/pages/receive/receive-ordinal.tsx
index 4b236f1ba06..d485aa2bf94 100644
--- a/src/app/pages/receive/receive-ordinal.tsx
+++ b/src/app/pages/receive/receive-ordinal.tsx
@@ -13,14 +13,14 @@ export function ReceiveOrdinalModal() {
   useBackgroundLocationRedirect();
   const analytics = useAnalytics();
   const { state } = useLocation();
-  const { onCopy } = useClipboard(state?.btcAddressTaproot);
+  const { onCopy } = useClipboard(state.btcAddressTaproot);
 
   function copyToClipboard() {
     void analytics.track('copy_address_to_add_new_inscription');
     toast.success('Copied to clipboard!');
     onCopy();
   }
-
+  // #4028 FIXME - this doesn't open in new tab as it loses btcAddressTaproot amd crashes btcStamp and Stx are OK?
   return (
     <ReceiveTokensLayout
       address={state.btcAddressTaproot}
diff --git a/src/app/routes/hooks/use-background-location-redirect.ts b/src/app/routes/hooks/use-background-location-redirect.ts
index 62dfad62d7e..b5803ca1e0d 100644
--- a/src/app/routes/hooks/use-background-location-redirect.ts
+++ b/src/app/routes/hooks/use-background-location-redirect.ts
@@ -5,8 +5,11 @@ import { RouteUrls } from '@shared/route-urls';
 
 import { useLocationState } from '@app/common/hooks/use-location-state';
 
-// If routes are accessed directly / opened in new tabs `backgroundLocation` is lost
-// this hook re-directs the users to home then overlays the modal so the BG is the home route
+/**
+ * If routes are accessed directly / opened in new tabs `backgroundLocation` is lost
+ * this hook re-directs the users to home then overlays the modal so the BG is the home route
+ */
+
 export function useBackgroundLocationRedirect(baseUrl = RouteUrls.Home) {
   const { pathname, state } = useLocation();
   const navigate = useNavigate();
diff --git a/src/app/routes/receive-routes.tsx b/src/app/routes/receive-routes.tsx
index 4b3ad22de6b..573a6a26706 100644
--- a/src/app/routes/receive-routes.tsx
+++ b/src/app/routes/receive-routes.tsx
@@ -13,11 +13,6 @@ export const receiveRoutes = (
     <Route path={RouteUrls.ReceiveStx} element={<ReceiveStxModal />} />
     <Route path={RouteUrls.ReceiveBtc} element={<ReceiveBtcModal />} />
     <Route path={RouteUrls.ReceiveBtcStamp} element={<ReceiveBtcModal type="btc-stamp" />} />
-    {/* Needed to show receive ordinal in Receive flow */}
-
-    <Route path={RouteUrls.ReceiveCollectibleOrdinal} element={<ReceiveOrdinalModal />} />
-
-    {/* Needed to show receive ordinal in Add flow */}
     <Route path={RouteUrls.ReceiveCollectible} element={<ReceiveModal type="collectible" />} />
     <Route path={RouteUrls.ReceiveCollectibleOrdinal} element={<ReceiveOrdinalModal />} />
   </Route>