diff --git a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java b/src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java
index 4e761c119..93ea55045 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java
@@ -102,9 +102,9 @@ public class HubToLocalConvertController implements FxController {
 		Preconditions.checkState(newPasswordController.isGoodPassword());
 		LOG.info("Converting hub vault {} to local", vault.getPath());
 		CompletableFuture.runAsync(() -> conversionStarted.setValue(true), Platform::runLater) //
-				.thenRunAsync(this::convertInternal, backgroundExecutorService) //TODO: which executor is used?
+				.thenRunAsync(this::convertInternal, backgroundExecutorService)
 				.whenCompleteAsync((result, exception) -> {
-					if (exception == null) { //TODO: check, how the exceptions are wrapped
+					if (exception == null) {
 						LOG.info("Conversion of vault {} succeeded.", vault.getPath());
 						window.setScene(successScene.get());
 					} else {
diff --git a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java b/src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java
index 628a22785..919901ffa 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java
@@ -10,24 +10,15 @@ import javafx.stage.Stage;
 
 public class HubToLocalSuccessController implements FxController {
 
-	private final FxApplicationWindows appWindows;
 	private final Stage window;
 	private final Vault vault;
 
 	@Inject
-	HubToLocalSuccessController(FxApplicationWindows appWindows, @ConvertVaultWindow Stage window, @ConvertVaultWindow Vault vault) {
-		this.appWindows = appWindows;
+	HubToLocalSuccessController(@ConvertVaultWindow Stage window, @ConvertVaultWindow Vault vault) {
 		this.window = window;
 		this.vault = vault;
 	}
 
-	@FXML
-	public void unlockAndClose() {
-		close();
-		vault.getVaultConfigCache();
-		appWindows.startUnlockWorkflow(vault, window);
-	}
-
 	@FXML
 	public void close() {
 		window.close();