diff --git a/SessionMessagingKit/ControlMessage.swift b/SessionMessagingKit/ControlMessage.swift
index a910776f7..cfc3d1560 100644
--- a/SessionMessagingKit/ControlMessage.swift
+++ b/SessionMessagingKit/ControlMessage.swift
@@ -1,3 +1,4 @@
+import SessionProtocolKit
 
 @objc(SNControlMessage)
 public class ControlMessage : Message {
@@ -5,10 +6,4 @@ public class ControlMessage : Message {
     public enum Kind {
         case sessionRequest(preKeyBundle: PreKeyBundle)
     }
-
-    public override class func fromProto(_ proto: SNProtoContent) -> ControlMessage? {
-        if let preKeyBundle = proto.prekeyBundleMessage {
-
-        }
-    }
 }
diff --git a/SessionProtocolKit/Meta/SessionProtocolKit.h b/SessionProtocolKit/Meta/SessionProtocolKit.h
index 737bbbafd..c7d59dbb0 100644
--- a/SessionProtocolKit/Meta/SessionProtocolKit.h
+++ b/SessionProtocolKit/Meta/SessionProtocolKit.h
@@ -3,10 +3,9 @@
 FOUNDATION_EXPORT double SessionProtocolKitVersionNumber;
 FOUNDATION_EXPORT const unsigned char SessionProtocolKitVersionString[];
 
-#import <SessionProtocolKit/OWSAsserts.h>
 #import <SessionProtocolKit/AxolotlStore.h>
-#import <Curve25519Kit/Curve25519.h>
 #import <SessionProtocolKit/NSData+OWS.h>
 #import <SessionProtocolKit/NSObject+OWS.h>
 #import <SessionProtocolKit/NSString+OWS.h>
-#import <SessionProtocolKit/Threading.h>
+#import <SessionProtocolKit/OWSLogs.h>
+#import <SessionProtocolKit/PreKeyBundle.h>
diff --git a/SessionProtocolKit/Protos/SPKProto.swift b/SessionProtocolKit/Protos/SPKProto.swift
index 5de7e84b6..18fa38351 100644
--- a/SessionProtocolKit/Protos/SPKProto.swift
+++ b/SessionProtocolKit/Protos/SPKProto.swift
@@ -14,6 +14,8 @@ public enum SPKProtoError: Error {
 
 @objc public class SPKProtoTSProtoWhisperMessage: NSObject {
 
+    class var logTag: String { "SPKProtoTSProtoWhisperMessage" }
+
     // MARK: - SPKProtoTSProtoWhisperMessageBuilder
 
     @objc public class func builder(ratchetKey: Data, counter: UInt32, ciphertext: Data) -> SPKProtoTSProtoWhisperMessageBuilder {
@@ -745,6 +747,8 @@ extension SPKProtoTSProtoSenderKeyDistributionMessage.SPKProtoTSProtoSenderKeyDi
 
 @objc public class SPKProtoClosedGroupCiphertextMessage: NSObject {
 
+    class var logTag: String { "SPKProtoClosedGroupCiphertextMessage" }
+
     // MARK: - SPKProtoClosedGroupCiphertextMessageBuilder
 
     @objc public class func builder(ciphertext: Data, senderPublicKey: Data, keyIndex: UInt32) -> SPKProtoClosedGroupCiphertextMessageBuilder {
diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 90929a189..d07f4420d 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -731,6 +731,7 @@
 		C3C2AA072553B9C400C340D1 /* Cryptography.m in Sources */ = {isa = PBXBuildFile; fileRef = C3C2A9EC2553B9C400C340D1 /* Cryptography.m */; };
 		C3C2AA082553B9C400C340D1 /* NSString+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = C3C2A9ED2553B9C400C340D1 /* NSString+OWS.m */; };
 		C3C2AA092553B9C400C340D1 /* NSObject+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = C3C2A9EE2553B9C400C340D1 /* NSObject+OWS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C3C2AAC82553C25300C340D1 /* SessionProtocolKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A8622553B41A00C340D1 /* SessionProtocolKit.framework */; };
 		C3C3CF8924D8EED300E1CCE7 /* TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C3CF8824D8EED300E1CCE7 /* TextView.swift */; };
 		C3D0972B2510499C00F6E3E4 /* BackgroundPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D0972A2510499C00F6E3E4 /* BackgroundPoller.swift */; };
 		C3DAB3242480CB2B00725F25 /* SRCopyableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DAB3232480CB2A00725F25 /* SRCopyableLabel.swift */; };
@@ -1791,6 +1792,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C3C2AAC82553C25300C340D1 /* SessionProtocolKit.framework in Frameworks */,
 				C3C2A70B25539E1E00C340D1 /* SessionSnodeKit.framework in Frameworks */,
 				5DF9AB212C6DB1E8BE70EFF6 /* Pods_SessionMessagingKit.framework in Frameworks */,
 			);