diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index ce01006c3..1b95f91f3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -41,7 +41,6 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 	}
 
 	private FontAwesome5Icon glyphForState(Worker.State state) {
-		// TODO choose appropriate glyphs
 		return switch (state) {
 			case READY -> FontAwesome5Icon.COG; //just a placeholder
 			case SCHEDULED -> FontAwesome5Icon.CLOCK;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index b7bbc321e..493ee9c23 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -43,7 +43,7 @@ class HealthCheckTask extends Task<Void> {
 	protected Void call() {
 		try (var masterkeyClone = masterkey.clone(); //
 			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
-			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> { //TODO: API-question about using Masterkey _and_ cryptor
+			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> {
 				if (isCancelled()) {
 					throw new CancellationException();
 				}
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 5cf3219a9..ee1cdebef 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -25,7 +25,6 @@
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
 			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
 				<Label fx:id="listHeading" text="%health.check.listHeader"/>
-				<!-- TODO:HEADER with select all checkbox -->
 				<CheckBox fx:id="selectAllBox" text="FIX: SELECT ALL" />
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>