diff --git a/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java b/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
index 52fbfb2..b8c6f5b 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/CropDetailController.java
@@ -212,7 +212,6 @@ public class CropDetailController {
                 taskListProperty.clear();
                 taskListProperty.addAll(taskList);
             } catch (IOException e) {
-                // TODO: Alert
                 LOG.log(Level.SEVERE, "Could not get task list for crop", e.getCause());
             }
         });
@@ -421,9 +420,7 @@ public class CropDetailController {
                     if (buttonType == ButtonType.OK) {
                         try {
                             gardenSchedule.removeTask(task);
-                            //setTaskListProperty(this.crop);
                         } catch (IOException e) {
-                            // TODO: Show error alert
                             LOG.log(Level.SEVERE, "Could not remove crop.", e);
                         }
                     }
diff --git a/src/main/java/ch/zhaw/gartenverwaltung/MyGardenController.java b/src/main/java/ch/zhaw/gartenverwaltung/MyGardenController.java
index d223a8e..21da05a 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/MyGardenController.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/MyGardenController.java
@@ -173,7 +173,6 @@ public class MyGardenController {
                 stage.setResizable(true);
                 stage.showAndWait();
             } catch (IOException | PlantNotFoundException e) {
-                // TODO: show error alert
                 LOG.log(Level.SEVERE, "Could not load plant details.", e);
             }
         };
@@ -219,7 +218,6 @@ public class MyGardenController {
                         try {
                             garden.removeCrop(crop);
                         } catch (IOException e) {
-                            // TODO: Show error alert
                             LOG.log(Level.SEVERE, "Could not remove crop.", e);
                         }
                     }
diff --git a/src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java b/src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java
index 617f03c..7f37fbf 100644
--- a/src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java
+++ b/src/main/java/ch/zhaw/gartenverwaltung/models/Garden.java
@@ -50,8 +50,6 @@ public class Garden {
      */
     public void plantAsCrop(Plant plant, LocalDate plantingDate) throws IOException, HardinessZoneNotSetException, PlantNotFoundException {
         Crop crop = new Crop(plant.id(), plantingDate);
-        //TODO Add Area to Plant
-        //crop.withArea(0);
         cropList.saveCrop(crop);
         gardenSchedule.planTasksForCrop(crop);
         plantedCrops.clear();