diff --git a/core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt b/core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt
index e25f04894e..c97c8bd479 100644
--- a/core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt
+++ b/core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt
@@ -25,7 +25,11 @@ interface ServiceHubCoreInternal : ServiceHub {
      */
     val notaryService: NotaryService?
 
-    fun createTransactionsResolver(flow: ResolveTransactionsval rotatedKeys: RotatedKeys)
+    fun createTransactionsResolver(flow: ResolveTransactionsFlow): TransactionsResolver
+
+    val attachmentsClassLoaderCache: AttachmentsClassLoaderCache
+
+    val rotatedKeys: RotatedKeys
 
     /**
      * Stores [SignedTransaction] and participant signatures without the notary signature in the local transaction storage,
diff --git a/core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt b/core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
index 45381599d6..5c8bc2c11c 100644
--- a/core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
+++ b/core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
@@ -88,7 +88,7 @@ abstract class AbstractVerifier(
  * Because we create a separate [LedgerTransaction] onto which we need to perform verification, it becomes important we don't verify the
  * wrong object instance. This class helps
  */
-private class Validator(private val ltx: LedgerTransaction, private val transactionClassLoader: ClassLoader) {
+private class Validator(private val ltx: LedgerTransaction, private val transactionClassLoader: ClassLoader, private val rotatedKeys: RotatedKeys) {
     private val inputStates: List<TransactionState<*>> = ltx.inputs.map(StateAndRef<ContractState>::state)
     private val allStates: List<TransactionState<*>> = inputStates + ltx.references.map(StateAndRef<ContractState>::state) + ltx.outputs
 
diff --git a/core/src/main/kotlin/net/corda/core/serialization/internal/AttachmentsClassLoader.kt b/core/src/main/kotlin/net/corda/core/serialization/internal/AttachmentsClassLoader.kt
index d1cb05f8dd..b8083c6727 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/internal/AttachmentsClassLoader.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/internal/AttachmentsClassLoader.kt
@@ -480,12 +480,7 @@ interface AttachmentsClassLoaderCache {
     fun computeIfAbsent(key: AttachmentsClassLoaderKey, mappingFunction: Function<in AttachmentsClassLoaderKey, out SerializationContext>): SerializationContext
 }
 
-<<<<<<< HEAD
 class AttachmentsClassLoaderCacheImpl(cacheFactory: NamedCacheFactory, override val rotatedKeys: RotatedKeys = CordaRotatedKeys.keys) : SingletonSerializeAsToken(), AttachmentsClassLoaderCache {
-=======
-class AttachmentsClassLoaderCacheImpl(cacheFactory: NamedCacheFactory) : SingletonSerializeAsToken(), AttachmentsClassLoaderCache {
-
->>>>>>> release/os/4.11
     private class ToBeClosed(
         serializationContext: SerializationContext,
         val classLoaderToClose: AutoCloseable,
diff --git a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
index 4574d7363f..bb141005e7 100644
--- a/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
@@ -317,18 +317,6 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
         cordappProvider = cordappProvider,
         attachments = attachments
     ).tokenize()
-    val verifierFactoryService: VerifierFactoryService = if (djvmCordaSource != null) {
-        DeterministicVerifierFactoryService(djvmBootstrapSource, djvmCordaSource).apply {
-            log.info("DJVM sandbox enabled for deterministic contract verification.")
-            if (!configuration.devMode) {
-                log.info("Generating Corda classes for DJVM sandbox.")
-                generateSandbox()
-            }
-            tokenize()
-        }
-    } else {
-        BasicVerifierFactoryService()
-    }
     private val attachmentsClassLoaderCache: AttachmentsClassLoaderCache = AttachmentsClassLoaderCacheImpl(cacheFactory, rotatedKeys).tokenize()
     val contractUpgradeService = ContractUpgradeServiceImpl(cacheFactory).tokenize()
     val auditService = DummyAuditService().tokenize()