diff --git a/build.dist.xml b/build.dist.xml
index bb4f9c73..04ee5adf 100644
--- a/build.dist.xml
+++ b/build.dist.xml
@@ -42,7 +42,6 @@
         <phing phingfile="${build.dir}/vendor/palantirnet/the-build/tasks/code_review/drupal_code_sniffer.xml" />
         <phing phingfile="${build.dir}/vendor/palantirnet/the-build/tasks/code_review/phpmd.xml" />
         <phing phingfile="${build.dir}/vendor/palantirnet/the-build/tasks/code_review/phplint.xml" />
-        <phing phingfile="${build.dir}/vendor/palantirnet/the-build/tasks/code_review/phptodo.xml" />
     </target>
 
 
diff --git a/composer.json b/composer.json
index f234ee14..5db2b4af 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "continuousphp/phing-drush-task": "dev-master",
         "drupal/coder": "*",
-        "nilportugues/php_todo": "^1.0",
+        "drush/drush": "^8.1.15",
         "pear/versioncontrol_git": "@dev",
         "phing/phing": "^2.14",
         "phpmd/phpmd": "^2.4",
diff --git a/conf/php_todo_finder.yml b/conf/php_todo_finder.yml
deleted file mode 100644
index d01617a9..00000000
--- a/conf/php_todo_finder.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-todo_finder:
-  total_allowed: 5
-  expressions:
-    - @todo
-    - TODO
-    - refactor
-    - FIX ME
diff --git a/docs/code_review.md b/docs/code_review.md
index e5abe368..2795876a 100644
--- a/docs/code_review.md
+++ b/docs/code_review.md
@@ -7,7 +7,6 @@ This will review your code with:
 * Drupal Codesniffer
 * PHPmd
 * PHP Lint
-* PHPtodo
 
 Generally, you should configure your `build.xml` to run code reviews as part of your `test` target so that developers run the reviews by default.
 
@@ -50,13 +49,5 @@ By default, when Codesniffer finds problems it will throw an error. If you must,
 drupal_code_sniffer.haltonerror=false
 ```
 
-### [PHP To-do Finder](https://github.com/nilportugues/php-todo-finder)
-
-Sets a threshold for the number of "to do" comments allowable in a codebase. The default config for this review can be found within the-build at `conf/php_todo_finder.yml`. To customize this config, copy that file to your project's `conf/` directory and add the build property:
-
-```
-phptodo.config=conf/php_todo_finder.yml
-```
-
 ----
-Copyright 2016 Palantir.net, Inc.
+Copyright 2017 Palantir.net, Inc.
diff --git a/docs/properties.md b/docs/properties.md
index e37fc209..095eb5b9 100644
--- a/docs/properties.md
+++ b/docs/properties.md
@@ -68,7 +68,6 @@ Cool! This phing-ism is what powers our environment-specific property layering a
 |---|---|---|
 | `phpmd.rulesets` | `vendor/palantirnet/the-build/conf/phpmd.xml` | Relative path to the PHPMD configuration. |
 | `drupal_code_sniffer.standard` | `vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml` | Relative path the the Drupal codesniffer standard. |
-| `phptodo.config` | `conf/php_todo_finder.yml` | Relative path to the PHP To-do Finder configuration. |
 
 [More info](code_review.md)
 
diff --git a/tasks/code_review/phptodo.xml b/tasks/code_review/phptodo.xml
deleted file mode 100644
index aa4d639e..00000000
--- a/tasks/code_review/phptodo.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  @file phptodo.xml
-  Target for running phptodo.
-
-  Copyright 2016 Palantir.net, Inc.
-  -->
-
-<project name="phptodo" default="test-run-phptodo">
-
-    <property name="phptodo.config" value="vendor/palantirnet/the-build/conf/php_todo_finder.yml" />
-
-    <!-- Target: test-run-phptodo -->
-    <target name="test-run-phptodo">
-        <echo>Checking modules</echo>
-        <exec
-            command="${build.dir}/vendor/bin/php_todo --config=${build.dir}/${phptodo.config} find ${build.dir}/${drupal.root}/modules/custom"
-            passthru="true"
-        />
-        <echo>Checking profiles</echo>
-        <exec
-            command="${build.dir}/vendor/bin/php_todo --config=${build.dir}/${phptodo.config} find ${build.dir}/${drupal.root}/profiles/custom"
-            passthru="true"
-        />
-        <echo>Checking themes</echo>
-        <exec
-            command="${build.dir}/vendor/bin/php_todo --config=${build.dir}/${phptodo.config} find ${build.dir}/${drupal.root}/themes/custom"
-            passthru="true"
-        />
-    </target>
-
-
-</project>