diff --git a/src/main/java/org/cryptomator/common/mount/Mounter.java b/src/main/java/org/cryptomator/common/mount/Mounter.java
index ee5b0a8e4..ba8da7b4f 100644
--- a/src/main/java/org/cryptomator/common/mount/Mounter.java
+++ b/src/main/java/org/cryptomator/common/mount/Mounter.java
@@ -107,7 +107,7 @@ public class Mounter {
 						//mountpoint must exist
 						throw new MountPointNotExistsException(e.getMessage());
 					} else {
-						//TODO: if (!canMountToDir && canMountToParent && !Files.notExists(userChosenMountPoint)) {
+						//TODO: add specific exception for !canMountToDir && canMountToParent && !Files.notExists(userChosenMountPoint)
 						throw new IllegalMountPointException(e.getMessage());
 					}
 				}
diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java
index b7fb0fd4c..7a6129edb 100644
--- a/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -345,10 +345,8 @@ public class Vault {
 	public boolean supportsForcedUnmount() {
 		var mh = mountHandle.get();
 		if (mh == null) {
-			//TODO: or return false?
 			throw new IllegalStateException("Vault is not mounted");
 		}
-		;
 		return mountHandle.get().supportsUnmountForced();
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 7474561cf..2a31f007e 100644
--- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -82,7 +82,7 @@ public class VolumePreferencesController implements FxController {
 
 		@Override
 		public String toString(MountService provider) {
-			return provider== null? "Automatic" : provider.displayName(); //TODO: adjust message
+			return provider.displayName();
 		}
 
 		@Override