diff --git a/Podfile b/Podfile
index ec0dbc25f..6e382494a 100644
--- a/Podfile
+++ b/Podfile
@@ -11,13 +11,13 @@ def shared_pods
   pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
   # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
   pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
-  pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git', branch: 'release/2.30.2'
-  # pod 'AxolotlKit', path: '../SignalProtocolKit'
+  # pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git'
+  pod 'AxolotlKit', path: '../SignalProtocolKit'
+  # pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git'
+  pod 'HKDFKit', path: '../HKDFKit'
+  # pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit'
+  pod 'Curve25519Kit', path: '../Curve25519Kit'
   pod 'SignalServiceKit', path: '.', testspecs: ["Tests"]
-  pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git'
-  # pod 'HKDFKit', path: '../HKDFKit'
-  pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit'
-  # pod 'Curve25519Kit', path: '../Curve25519Kit'
   pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework'
   #pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'
 
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index a2f3ef5e6..60d549ba3 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -52,7 +52,7 @@
 #import <SignalCoreKit/NSDate+OWS.h>
 #import <SignalCoreKit/NSString+SSK.h>
 #import <SignalCoreKit/OWSAsserts.h>
-#import <SignalCoreKit/OWSLogger.h>
+#import <SignalCoreKit/OWSLogs.h>
 #import <SignalCoreKit/Threading.h>
 #import <SignalMessaging/AttachmentSharing.h>
 #import <SignalMessaging/ContactTableViewCell.h>
diff --git a/SignalServiceKit/src/TSPrefix.h b/SignalServiceKit/src/TSPrefix.h
index 424b2f935..c9c36c4e5 100644
--- a/SignalServiceKit/src/TSPrefix.h
+++ b/SignalServiceKit/src/TSPrefix.h
@@ -12,9 +12,6 @@ static const NSUInteger ddLogLevel = DDLogLevelAll;
 static const NSUInteger ddLogLevel = DDLogLevelInfo;
 #endif
 #import "OWSAnalytics.h"
-#import "SSKAsserts.h"
-
-//#import <SignalCoreKit/OWSAsserts.h>
-//#import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>
+#import "SSKAsserts.h"
diff --git a/SignalServiceKit/src/Util/SSKAsserts.h b/SignalServiceKit/src/Util/SSKAsserts.h
index 722962a4c..9d88a1cab 100755
--- a/SignalServiceKit/src/Util/SSKAsserts.h
+++ b/SignalServiceKit/src/Util/SSKAsserts.h
@@ -3,10 +3,8 @@
 //
 
 #import "AppContext.h"
-
-//#import <SignalCoreKit/OWSAsserts.h>
-//#import <SignalCoreKit/NSObject+OWS.h>
-//#import <SignalCoreKit/OWSAsserts.h>
+#import <SignalCoreKit/NSObject+OWS.h>
+#import <SignalCoreKit/OWSAsserts.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalShareExtension/SignalShareExtension-Bridging-Header.h b/SignalShareExtension/SignalShareExtension-Bridging-Header.h
index 83c92c2df..7cb3cc22f 100644
--- a/SignalShareExtension/SignalShareExtension-Bridging-Header.h
+++ b/SignalShareExtension/SignalShareExtension-Bridging-Header.h
@@ -10,7 +10,7 @@
 #import "ShareAppExtensionContext.h"
 #import <SignalCoreKit/NSObject+OWS.h>
 #import <SignalCoreKit/OWSAsserts.h>
-#import <SignalCoreKit/OWSLogger.h>
+#import <SignalCoreKit/OWSLogs.h>
 #import <SignalMessaging/DebugLogger.h>
 #import <SignalMessaging/Environment.h>
 #import <SignalMessaging/OWSContactsManager.h>