diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index dc0092e8d9..02fb98ba5e 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -12,8 +12,6 @@ SOURCE_EXTS = [
 
 UTILITY_SOURCE_EXTS = [ 'utility/' + glob for glob in SOURCE_EXTS ]
 
-# TODO: Once HAL patches get in, need to filter out the HAL based
-# on the bld.env.BOARD.
 COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
     'AP_AccelCal',
     'AP_ADC',
diff --git a/wscript b/wscript
index 6c6dfdd6af..b73e8d5a39 100644
--- a/wscript
+++ b/wscript
@@ -20,22 +20,12 @@ from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallCo
 # pastable. Add the 'export waf="$PWD/waf"' trick to be copy-pastable
 # as well.
 
-# TODO: add support for unit tests.
-
 # TODO: replace defines with the use of a generated config.h file
 # this makes recompilation at least when defines change. which might
 # be sufficient.
 
 # TODO: set git version as part of build preparation.
 
-# TODO: Check if we should simply use the signed 'waf' "binary" (after
-# verifying it) instead of generating it ourselves from the sources.
-
-# TODO: evaluate if we need shortcut commands for the common targets
-# (vehicles). currently using waf --targets=NAME the target name must
-# contain the board extension so make it less convenient, maybe hook
-# to support automatic filling this extension?
-
 def init(ctx):
     env = ConfigSet.ConfigSet()
     try: