diff --git a/src/contract/index.ts b/src/contract/index.ts
index 1990682..4052050 100644
--- a/src/contract/index.ts
+++ b/src/contract/index.ts
@@ -1,6 +1,2 @@
 export * from './Contract';
 export * from './HandlerBasedContract';
-export * from '../core/web/SmartWeaveWebFactory';
-export * from '../core/node/SmartWeaveNodeFactory';
-export * from '../core/SmartWeave';
-export * from '../core/SmartWeaveBuilder';
diff --git a/src/core/SmartWeave.ts b/src/core/SmartWeave.ts
index 96cc6e4..67f5094 100644
--- a/src/core/SmartWeave.ts
+++ b/src/core/SmartWeave.ts
@@ -4,10 +4,11 @@ import {
   HandlerApi,
   InteractionsLoader,
   InteractionsSorter,
+  SmartWeaveBuilder,
   StateEvaluator
 } from '@smartweave/core';
 import Arweave from 'arweave';
-import { Contract, HandlerBasedContract, SmartWeaveBuilder } from '@smartweave/contract';
+import { Contract, HandlerBasedContract } from '@smartweave/contract';
 
 /**
  * The SmartWeave "motherboard" ;-).
diff --git a/src/core/index.ts b/src/core/index.ts
index b8cc10b..33f062f 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -1,12 +1,8 @@
 export * from './modules/DefinitionLoader';
-export * from './ExecutionContextModifier';
 export * from './modules/ExecutorFactory';
 export * from './modules/InteractionsLoader';
 export * from './modules/InteractionsSorter';
 export * from './modules/StateEvaluator';
-export * from './SmartWeaveTags';
-export * from './ExecutionContext';
-export * from './ContractDefinition';
 
 export * from './modules/impl/BlockHeightInteractionsSorter';
 export * from './modules/impl/ContractDefinitionLoader';
@@ -14,3 +10,13 @@ export * from './modules/impl/ContractInteractionsLoader';
 export * from './modules/impl/DefaultStateEvaluator';
 export * from './modules/impl/HandlerExecutorFactory';
 export * from './modules/impl/LexicographicalInteractionsSorter';
+
+export * from './ExecutionContextModifier';
+export * from './SmartWeaveTags';
+export * from './ExecutionContext';
+export * from './ContractDefinition';
+
+export * from './web/SmartWeaveWebFactory';
+export * from './node/SmartWeaveNodeFactory';
+export * from './SmartWeave';
+export * from './SmartWeaveBuilder';
diff --git a/src/core/node/SmartWeaveNodeFactory.ts b/src/core/node/SmartWeaveNodeFactory.ts
index 5bfee64..18efbed 100644
--- a/src/core/node/SmartWeaveNodeFactory.ts
+++ b/src/core/node/SmartWeaveNodeFactory.ts
@@ -1,17 +1,12 @@
-import {
-  Contract,
-  HandlerBasedContract,
-  SmartWeave,
-  SmartWeaveBuilder,
-  SmartWeaveWebFactory
-} from '@smartweave/contract';
 import Arweave from 'arweave';
 import {
   ContractDefinitionLoader,
   ContractInteractionsLoader,
-  EvalStateResult,
   HandlerExecutorFactory,
-  LexicographicalInteractionsSorter
+  LexicographicalInteractionsSorter,
+  SmartWeave,
+  SmartWeaveBuilder,
+  SmartWeaveWebFactory
 } from '@smartweave/core';
 import {
   CacheableContractInteractionsLoader,
diff --git a/src/core/web/SmartWeaveWebFactory.ts b/src/core/web/SmartWeaveWebFactory.ts
index 3b04ad3..b152678 100644
--- a/src/core/web/SmartWeaveWebFactory.ts
+++ b/src/core/web/SmartWeaveWebFactory.ts
@@ -1,5 +1,4 @@
 import Arweave from 'arweave';
-import { HandlerBasedContract, Contract, SmartWeave, SmartWeaveBuilder } from '@smartweave/contract';
 import {
   CacheableContractInteractionsLoader,
   CacheableExecutorFactory,
@@ -11,11 +10,12 @@ import {
   ContractInteractionsLoader,
   DefaultStateEvaluator,
   EvalStateResult,
-  HandlerApi,
   HandlerExecutorFactory,
-  LexicographicalInteractionsSorter
+  LexicographicalInteractionsSorter,
+  SmartWeave,
+  SmartWeaveBuilder
 } from '@smartweave/core';
-import { BsonFileBlockHeightSwCache, MemBlockHeightSwCache, MemCache } from '@smartweave/cache';
+import { MemBlockHeightSwCache, MemCache } from '@smartweave/cache';
 
 /**
  * A factory that simplifies the process of creating different versions of {@link SmartWeave}.