diff --git a/src/installer.rs b/src/installer.rs
index 99f83c3..a334a1d 100644
--- a/src/installer.rs
+++ b/src/installer.rs
@@ -88,7 +88,6 @@ impl InstallerFramework {
         messages: &Sender<InstallMessage>,
         fresh_install: bool,
     ) -> Result<(), String> {
-        // TODO: Uninstall packages that aren't selected
         info!(
             "Framework: Installing {:?} to {:?}",
             items,
diff --git a/src/rest.rs b/src/rest.rs
index 2229f29..06dcf7c 100644
--- a/src/rest.rs
+++ b/src/rest.rs
@@ -78,7 +78,6 @@ impl Service for WebService {
     fn call(&self, req: Self::Request) -> Self::Future {
         Box::new(future::ok(match (req.method(), req.path()) {
             // This endpoint should be usable directly from a <script> tag during loading.
-            // TODO: Handle errors
             (&Get, "/api/config") => {
                 let framework = self
                     .framework
@@ -99,7 +98,6 @@ impl Service for WebService {
                     .with_body(file)
             }
             // This endpoint should be usable directly from a <script> tag during loading.
-            // TODO: Handle errors
             (&Get, "/api/packages") => {
                 let framework = self
                     .framework