diff --git a/src/lib/SmartTokens/Types/PTokenDirectory.hs b/src/lib/SmartTokens/Types/PTokenDirectory.hs
index 9f4456f..2aaee2d 100644
--- a/src/lib/SmartTokens/Types/PTokenDirectory.hs
+++ b/src/lib/SmartTokens/Types/PTokenDirectory.hs
@@ -264,15 +264,6 @@ pisInsertedNode = phoistAcyclic $
             pmkDirectorySetNode # insertedKey # coveringNext # pdeserializeCredential transferLogicCred_ # pdeserializeCredential issuerLogicCred_
       in outputNode #== expectedDirectoryNode
 
-      -- TODO (jm): Uncommenting the following line results in an error. This is spdeserializeCredential trange because the check below
-      -- asserts that the 'key' and 'next' fields of 'outputnode' are equal to what we expect, and the other two
-      -- fields (transferLogicScript, issuerLogicScript) should also be equal when we construct the 'expectedDirectoryNode'
-
-      -- in ptraceInfo (pshow $ pmkBuiltinList [pforgetData expectedDirectoryNode]) $ outputNode #== expectedDirectoryNode
-
-      -- -- in pforgetData insertedKey #== pforgetData outputNodeDatumF.key
-      -- --     #&& pforgetData coveringNext #== pforgetData ptailNextData
-
 pdeserializeCredential :: Term s (PAsData PCredential) -> Term s (PAsData PCredential)
 pdeserializeCredential term =
   plet (pasConstr # pforgetData term) $ \constrPair ->
diff --git a/src/lib/Wst/Offchain/Env.hs b/src/lib/Wst/Offchain/Env.hs
index 13a1015..4456887 100644
--- a/src/lib/Wst/Offchain/Env.hs
+++ b/src/lib/Wst/Offchain/Env.hs
@@ -350,12 +350,12 @@ addTransferEnv :: TransferLogicEnv -> CombinedEnv o d t r era -> CombinedEnv o d
 addTransferEnv de env =
   env{ceTransfer = Identity de }
 
-withTransfer :: MonadReader (CombinedEnv o d t r era) m => TransferLogicEnv -> ReaderT (CombinedEnv o d Identity r era) m a -> m a
+withTransfer :: MonadReader (CombinedEnv o Identity t r era) m => TransferLogicEnv -> ReaderT (CombinedEnv o Identity Identity r era) m a -> m a
 withTransfer dir action = do
   asks (addTransferEnv dir)
     >>= runReaderT action
 
-withTransferFor :: MonadReader (CombinedEnv o d t r era) m => C.PaymentCredential -> C.Hash C.PaymentKey -> ReaderT (CombinedEnv o d Identity r era) m a -> m a
+withTransferFor :: MonadReader (CombinedEnv o Identity t r era) m => C.PaymentCredential -> C.Hash C.PaymentKey -> ReaderT (CombinedEnv o Identity Identity r era) m a -> m a
 withTransferFor plbBaseCred opPKH = withTransfer $ mkTransferLogicEnv plbBaseCred opPKH
 
 withTransferFromOperator :: (MonadReader (CombinedEnv Identity Identity t r era) m) => ReaderT (CombinedEnv Identity Identity Identity r era) m a -> m a