diff --git a/Signal/src/call/CallAudioService.swift b/Signal/src/call/CallAudioService.swift
index a841bab60..cc61ca389 100644
--- a/Signal/src/call/CallAudioService.swift
+++ b/Signal/src/call/CallAudioService.swift
@@ -124,7 +124,6 @@ protocol CallAudioServiceDelegate: class {
         super.init()
 
         // We cannot assert singleton here, because this class gets rebuilt when the user changes relevant call settings
-        // SwiftSingletons.register(self)
 
         // Configure audio session so we don't prompt user with Record permission until call is connected.
 
diff --git a/Signal/src/call/Speakerbox/CallKitCallManager.swift b/Signal/src/call/Speakerbox/CallKitCallManager.swift
index 545e08c80..7b3e7ae97 100644
--- a/Signal/src/call/Speakerbox/CallKitCallManager.swift
+++ b/Signal/src/call/Speakerbox/CallKitCallManager.swift
@@ -28,7 +28,6 @@ final class CallKitCallManager: NSObject {
         super.init()
 
         // We cannot assert singleton here, because this class gets rebuilt when the user changes relevant call settings
-        // SwiftSingletons.register(self)
     }
 
     // MARK: Actions
diff --git a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
index d96fdd7f2..bd9d9f87c 100644
--- a/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
+++ b/Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
@@ -80,7 +80,6 @@ final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate {
         super.init()
 
         // We cannot assert singleton here, because this class gets rebuilt when the user changes relevant call settings
-        // SwiftSingletons.register(self)
 
         self.provider.setDelegate(self, queue: nil)
     }
diff --git a/Signal/src/call/UserInterface/CallUIAdapter.swift b/Signal/src/call/UserInterface/CallUIAdapter.swift
index 3956b1a4f..fa82b7729 100644
--- a/Signal/src/call/UserInterface/CallUIAdapter.swift
+++ b/Signal/src/call/UserInterface/CallUIAdapter.swift
@@ -116,7 +116,6 @@ extension CallUIAdaptee {
         super.init()
 
         // We cannot assert singleton here, because this class gets rebuilt when the user changes relevant call settings
-        // SwiftSingletons.register(self)
 
         callService.addObserverAndSyncState(observer: self)
     }
diff --git a/SignalMessaging/utils/OWSPreferences.m b/SignalMessaging/utils/OWSPreferences.m
index d61369b23..afdda8394 100644
--- a/SignalMessaging/utils/OWSPreferences.m
+++ b/SignalMessaging/utils/OWSPreferences.m
@@ -192,7 +192,7 @@ NSString *const OWSPreferencesKeySystemCallLogEnabled = @"OWSPreferencesKeySyste
         // didn't want their calls showing up in the call log, we want to disable call logging
         NSNumber *callKitPreference = [self tryGetValueForKey:OWSPreferencesKeyCallKitEnabled];
         if (callKitPreference && !callKitPreference.boolValue) {
-            // user expclitily opted out of callKit, so disable system call logging.
+            // user explicitly opted out of callKit, so disable system call logging.
             return NO;
         }
     }