diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts
index 2874ca3d..2466c495 100644
--- a/packages/core/src/core.ts
+++ b/packages/core/src/core.ts
@@ -277,7 +277,7 @@ class ThresholdKey implements ITKey {
           const tempStateManualSync = this.manualSync;
           this.manualSync = true;
           await this._initializeNewKey({ initializeModules: true, importedKey: this.serviceProvider.migratableKey, delete1OutOf1: true });
-          await this.syncLocalMetadataTransitions();
+          if (!tempStateManualSync) await this.syncLocalMetadataTransitions(); // Only sync if we were not in manual sync mode
           // restore manual sync flag
           this.manualSync = tempStateManualSync;
         } else {
diff --git a/packages/service-provider-sfa/src/SfaServiceProvider.ts b/packages/service-provider-sfa/src/SfaServiceProvider.ts
index 1ed1e329..2e15db3d 100644
--- a/packages/service-provider-sfa/src/SfaServiceProvider.ts
+++ b/packages/service-provider-sfa/src/SfaServiceProvider.ts
@@ -55,8 +55,6 @@ class SfaServiceProvider extends ServiceProviderBase {
     if (params.serverTimeOffset) {
       this.authInstance.serverTimeOffset = params.serverTimeOffset;
     }
-    // Does the key assign
-    // if (this.authInstance.isLegacyNetwork) await this.authInstance.getPublicAddress(torusNodeEndpoints, torusNodePub, { verifier, verifierId });
 
     let finalIdToken = idToken;
     let finalVerifierParams = { verifier_id: verifierId };