diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 627066216..d4a54b5bf 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -204,7 +204,6 @@ module Vagrant
                 url: url,
                 versions: metadata.versions.join(", ")
             else
-              # TODO: show supported providers
               raise Errors::BoxAddNoMatchingProvider,
                 name: metadata.name,
                 requested: provider,
diff --git a/lib/vagrant/action/runner.rb b/lib/vagrant/action/runner.rb
index a654e37e3..6d4a2e409 100644
--- a/lib/vagrant/action/runner.rb
+++ b/lib/vagrant/action/runner.rb
@@ -3,9 +3,6 @@ require 'log4r'
 require 'vagrant/action/hook'
 require 'vagrant/util/busy'
 
-# TODO:
-# * env.lock
-
 module Vagrant
   module Action
     class Runner
diff --git a/lib/vagrant/config/loader.rb b/lib/vagrant/config/loader.rb
index 1434e44fb..feaca4377 100644
--- a/lib/vagrant/config/loader.rb
+++ b/lib/vagrant/config/loader.rb
@@ -76,7 +76,6 @@ module Vagrant
 
         unknown_sources = @sources.keys - order
         if !unknown_sources.empty?
-          # TODO: Raise exception here perhaps.
           @logger.error("Unknown config sources: #{unknown_sources.inspect}")
         end
 
diff --git a/lib/vagrant/util/template_renderer.rb b/lib/vagrant/util/template_renderer.rb
index dcdd892f0..ec0c0179e 100644
--- a/lib/vagrant/util/template_renderer.rb
+++ b/lib/vagrant/util/template_renderer.rb
@@ -56,7 +56,6 @@ module Vagrant
       #
       # @return [String]
       def render
-        # TODO: Seems like a pretty dirty way to do this. Perhaps refactor this
         old_template = template
         result = nil
         File.open(full_template_path, 'r') do |f|
diff --git a/plugins/kernel_v1/config/ssh.rb b/plugins/kernel_v1/config/ssh.rb
index 3af437184..7226917ca 100644
--- a/plugins/kernel_v1/config/ssh.rb
+++ b/plugins/kernel_v1/config/ssh.rb
@@ -38,8 +38,6 @@ module VagrantPlugins
         new.ssh.forward_agent    = @forward_agent if @forward_agent != UNSET_VALUE
         new.ssh.forward_x11      = @forward_x11 if @forward_x11 != UNSET_VALUE
         new.ssh.shell            = @shell if @shell != UNSET_VALUE
-
-        # TODO: Warn that max_tries and timeout are gone
       end
     end
   end
diff --git a/plugins/providers/docker/driver.rb b/plugins/providers/docker/driver.rb
index 4f4a4e7fc..35e8b73b8 100644
--- a/plugins/providers/docker/driver.rb
+++ b/plugins/providers/docker/driver.rb
@@ -19,7 +19,9 @@ module VagrantPlugins
         regexp = /Successfully built (.+)$/i
         match  = regexp.match(result)
         if !match
-          # TODO: error
+          # This will cause a stack trace in Vagrant, but it is a bug
+          # if this happens anyways.
+          raise "UNKNOWN OUTPUT: #{result}"
         end
 
         match[1]
@@ -86,7 +88,6 @@ module VagrantPlugins
           execute('docker', 'start', cid)
           # This resets the cached information we have around, allowing `vagrant reload`s
           # to work properly
-          # TODO: Add spec to verify this behavior
           @data = nil
         end
       end