diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index f080c2943..dca83d632 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -28,7 +28,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AC9FA9C4CB8DFE0155BD054D6E704C10"
+               BlueprintIdentifier = "11A6AC8599513843417D550671469823"
                BuildableName = "SignalServiceKit.framework"
                BlueprintName = "SignalServiceKit"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
diff --git a/SignalMessaging/environment/VersionMigrations.m b/SignalMessaging/environment/VersionMigrations.m
index 143e4b0e0..3e12926bb 100644
--- a/SignalMessaging/environment/VersionMigrations.m
+++ b/SignalMessaging/environment/VersionMigrations.m
@@ -65,6 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
 
+    /*
     if ([self isVersion:previousVersion atLeast:@"1.0.2" andLessThan:@"2.0"]) {
         OWSLogError(@"Migrating from RedPhone no longer supported. Quitting.");
         // Not translating these as so few are affected.
@@ -83,6 +84,7 @@ NS_ASSUME_NONNULL_BEGIN
 
         [CurrentAppContext().frontmostViewController presentAlert:alert];
     }
+     */
 
     if ([self isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.1.70"] && [self.tsAccountManager isRegistered]) {
         [self clearVideoCache];
diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index e968ffac3..ecce2ee27 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@@ -711,6 +711,8 @@ NSString *const TSAccountManager_NeedsAccountAttributesUpdateKey = @"TSAccountMa
         return [AnyPromise promiseWithValue:@(1)];
     }
 
+    return [AnyPromise promiseWithValue:@(1)];
+    
     NSDate *_Nullable updateRequestDate =
         [self.dbConnection objectForKey:TSAccountManager_NeedsAccountAttributesUpdateKey
                            inCollection:TSAccountManager_UserAccountCollection];
diff --git a/SignalServiceKit/src/Messages/OWSBlockingManager.m b/SignalServiceKit/src/Messages/OWSBlockingManager.m
index 873193adf..b9d62960c 100644
--- a/SignalServiceKit/src/Messages/OWSBlockingManager.m
+++ b/SignalServiceKit/src/Messages/OWSBlockingManager.m
@@ -350,6 +350,7 @@ NSString *const kOWSBlockingManager_SyncedBlockedGroupIdsKey = @"kOWSBlockingMan
 // This method should only be called from within a synchronized block.
 - (void)syncBlockListIfNecessary
 {
+    /*
     OWSAssertDebug(_blockedPhoneNumberSet);
 
     // If we haven't yet successfully synced the current "block list" changes,
@@ -376,6 +377,7 @@ NSString *const kOWSBlockingManager_SyncedBlockedGroupIdsKey = @"kOWSBlockingMan
 
     OWSLogInfo(@"retrying sync of block list");
     [self sendBlockListSyncMessageWithPhoneNumbers:self.blockedPhoneNumbers groupIds:localBlockedGroupIds];
+     */
 }
 
 - (void)sendBlockListSyncMessageWithPhoneNumbers:(NSArray<NSString *> *)blockedPhoneNumbers
diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
index 68214a7d7..7dc6d5c69 100644
--- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
+++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
@@ -220,7 +220,7 @@ NS_ASSUME_NONNULL_BEGIN
     NSString *path = [textSecureAccountsAPI stringByAppendingString:textSecureAttributesAPI];
 
     NSString *authKey = self.tsAccountManager.serverAuthToken;
-    OWSAssertDebug(authKey.length > 0);
+    // OWSAssertDebug(authKey.length > 0);
     NSString *_Nullable pin = [self.ows2FAManager pinCode];
 
     NSDictionary<NSString *, id> *accountAttributes = [self accountAttributesWithPin:pin authKey:authKey];
@@ -321,7 +321,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSDictionary<NSString *, id> *)accountAttributesWithPin:(nullable NSString *)pin
                                                    authKey:(NSString *)authKey
 {
-    OWSAssertDebug(authKey.length > 0);
+    // OWSAssertDebug(authKey.length > 0);
     uint32_t registrationId = [self.tsAccountManager getOrGenerateRegistrationId];
 
     BOOL isManualMessageFetchEnabled = self.tsAccountManager.isManualMessageFetchEnabled;