diff --git a/js/background.js b/js/background.js
index d2f5b7e9b..9010d6f3d 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1326,7 +1326,7 @@
       messageReceiver = new textsecure.MessageReceiver(mySignalingKey, options);
       messageReceiver.addEventListener(
         'message',
-        window.NewReceiver.handleMessageEvent
+        window.DataMessageReceiver.handleMessageEvent
       );
       window.textsecure.messaging = new textsecure.MessageSender();
       return;
@@ -1337,11 +1337,11 @@
     messageReceiver = new textsecure.MessageReceiver(mySignalingKey, options);
     messageReceiver.addEventListener(
       'message',
-      window.NewReceiver.handleMessageEvent
+      window.DataMessageReceiver.handleMessageEvent
     );
     messageReceiver.addEventListener(
       'sent',
-      window.NewReceiver.handleMessageEvent
+      window.DataMessageReceiver.handleMessageEvent
     );
     messageReceiver.addEventListener('empty', onEmpty);
     messageReceiver.addEventListener('reconnect', onReconnect);
diff --git a/preload.js b/preload.js
index ea0ea7a7b..c22b99888 100644
--- a/preload.js
+++ b/preload.js
@@ -420,6 +420,7 @@ window.addEventListener('contextmenu', e => {
 });
 
 window.NewReceiver = require('./ts/receiver/receiver');
+window.DataMessageReceiver = require('./ts/receiver/dataMessage');
 window.NewSnodeAPI = require('./ts/session/snode_api/serviceNodeAPI');
 window.SnodePool = require('./ts/session/snode_api/snodePool');
 
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 5825e63c0..cfe4743d0 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -19,27 +19,14 @@ import _ from 'lodash';
 
 export { processMessage, onDeliveryReceipt };
 
-import {
-  handleDataMessage,
-  handleMessageEvent,
-  updateProfile,
-} from './dataMessage';
+import { handleMessageEvent, updateProfile } from './dataMessage';
 
 import { getEnvelopeId } from './common';
 import { StringUtils } from '../session/utils';
 import { SignalService } from '../protobuf';
-import { BlockedNumberController } from '../util/blockedNumberController';
 import { MultiDeviceProtocol } from '../session/protocols';
 
 // TODO: check if some of these exports no longer needed
-export {
-  handleEndSession,
-  handleMediumGroupUpdate,
-  downloadAttachment,
-  handleDataMessage,
-  updateProfile,
-  handleMessageEvent,
-};
 
 interface ReqOptions {
   conversationId: string;
diff --git a/ts/receiver/syncMessages.ts b/ts/receiver/syncMessages.ts
index 10983ebb8..4c180ee87 100644
--- a/ts/receiver/syncMessages.ts
+++ b/ts/receiver/syncMessages.ts
@@ -11,14 +11,12 @@ import {
   handleMessageEvent,
   isMessageEmpty,
   processDecrypted,
+  updateProfile,
 } from './dataMessage';
-import { updateProfile } from './receiver';
 import { handleContacts } from './multidevice';
 import { updateOrCreateGroupFromSync } from '../session/medium_group';
 import { MultiDeviceProtocol } from '../session/protocols';
-import { DataMessage } from '../session/messages/outgoing';
 import { BlockedNumberController } from '../util';
-import { StringUtils } from '../session/utils';
 
 export async function handleSyncMessage(
   envelope: EnvelopePlus,