diff --git a/core/src/federation/client/1_0/CommandClient.ts b/core/src/federation/client/1_0/CommandClient.ts
index 448615765..f5e88cad3 100644
--- a/core/src/federation/client/1_0/CommandClient.ts
+++ b/core/src/federation/client/1_0/CommandClient.ts
@@ -1,9 +1,10 @@
-import { EncryptedTransferArgs, ensureUrlEndsWithSlash } from 'core'
+import { EncryptedTransferArgs } from '../../../graphql/model/EncryptedTransferArgs'
 import { FederatedCommunity as DbFederatedCommunity } from 'database'
 import { GraphQLClient } from 'graphql-request'
 import { getLogger } from 'log4js'
 import { LOG4JS_BASE_CATEGORY_NAME } from '../../../config/const'
 import { sendCommand } from './query/sendCommand'
+import { ensureUrlEndsWithSlash } from '../../../util/utilities'
 
 const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.federation.client.1_0.CommandClient`)
 
diff --git a/core/src/graphql/logic/processXComSendCoins.ts b/core/src/graphql/logic/processXComSendCoins.ts
index 345c6e406..9a4ba4fd0 100644
--- a/core/src/graphql/logic/processXComSendCoins.ts
+++ b/core/src/graphql/logic/processXComSendCoins.ts
@@ -39,7 +39,7 @@ import { fullName } from '../../util/utilities'
 import { settlePendingSenderTransaction } from './settlePendingSenderTransaction'
 import { storeForeignUser } from './storeForeignUser'
 import { storeLinkAsRedeemed } from './storeLinkAsRedeemed'
-import { V1_0_CommandClient } from '../..'
+import { CommandClient as V1_0_CommandClient } from '../../federation/client/1_0/CommandClient'
 import { SendEmailCommand } from '../../command/commands/SendEmailCommand'
 
 const createLogger = (method: string) =>