diff --git a/src/main/java/name/nathanmcrae/numbersstation/MainController.java b/src/main/java/name/nathanmcrae/numbersstation/MainController.java
index 91737ba..c44ed0b 100644
--- a/src/main/java/name/nathanmcrae/numbersstation/MainController.java
+++ b/src/main/java/name/nathanmcrae/numbersstation/MainController.java
@@ -213,8 +213,6 @@ public class MainController implements Initializable {
             .findFirst()
             .orElse(null);
 
-        // TODO: if there are no stations, then create a default station and select that
-
         if (selectedStation == null) {
             logger.log(Level.SEVERE, "Selected station '" + selectedStationName.get() + "' not found");
             selectedStation = settings.getStations().get(0);
@@ -319,8 +317,6 @@ public class MainController implements Initializable {
 
         settings.save();
 
-        // TODO: Load message from file
-        // If the message we're overwriting is different from its file, then prompt to confirm
         Path nextMessagePath = selectedStation.stationPath().resolve("next-message.txt");
 
         String messageText;
diff --git a/src/main/java/name/nathanmcrae/numbersstation/WindowsScheduler.java b/src/main/java/name/nathanmcrae/numbersstation/WindowsScheduler.java
index 096a3f9..6665a07 100644
--- a/src/main/java/name/nathanmcrae/numbersstation/WindowsScheduler.java
+++ b/src/main/java/name/nathanmcrae/numbersstation/WindowsScheduler.java
@@ -228,7 +228,6 @@ public class WindowsScheduler {
         logger.info("Executable Path: " + executablePath);
 
         Element command = doc.createElement("Command");
-        // TODO: need to figure out the real invocation
         command.appendChild(doc.createTextNode(executablePath.toString()));
         exec.appendChild(command);