diff --git a/src/PackageWatcher.ts b/src/PackageWatcher.ts
index 25e5618d5..96d18364a 100644
--- a/src/PackageWatcher.ts
+++ b/src/PackageWatcher.ts
@@ -108,8 +108,6 @@ export class PackageWatcher {
         watcher.onDidDelete(async () => await this.handleWorkspaceStateChange());
 
         if (await fileExists(uri.fsPath)) {
-            // TODO: Remove this
-            this.logger.info("Loading initial workspace-state.json");
             await this.handleWorkspaceStateChange();
         }
 
@@ -195,10 +193,6 @@ export class PackageWatcher {
      */
     private async handleWorkspaceStateChange() {
         await this.folderContext.reloadWorkspaceState();
-        // TODO: Remove this
-        this.logger.info(
-            `Package watcher state updated workspace-state.json: ${JSON.stringify(this.folderContext.swiftPackage.workspaceState, null, 2)}`
-        );
         await this.folderContext.fireEvent(FolderOperation.workspaceStateUpdated);
     }
 }
diff --git a/src/WorkspaceContext.ts b/src/WorkspaceContext.ts
index d448e31bc..fd126bffa 100644
--- a/src/WorkspaceContext.ts
+++ b/src/WorkspaceContext.ts
@@ -515,7 +515,7 @@ export class WorkspaceContext implements vscode.Disposable {
     async removeWorkspaceFolder(workspaceFolder: vscode.WorkspaceFolder) {
         for (const folder of this.folders) {
             if (folder.workspaceFolder !== workspaceFolder) {
-                return;
+                continue;
             }
             // if current folder is this folder send unfocus event by setting
             // current folder to undefined