diff --git a/boost/yap/expression.hpp b/boost/yap/expression.hpp
index d922e75..1502905 100644
--- a/boost/yap/expression.hpp
+++ b/boost/yap/expression.hpp
@@ -132,7 +132,7 @@ namespace boost { namespace yap {
             customization point.  This function is only defined if the
             configuration macro
             <code>BOOST_YAP_CONVERSION_OPERATOR_TEMPLATE</code> has been
-            defined by the user to be nonzero. */ // TODO: customization points need documentation.
+            defined by the user to be nonzero. */
         template <typename R>
         operator R ()
         { return eval_expression_as(*this, hana::basic_type<R>{}); }
@@ -381,7 +381,7 @@ namespace boost { namespace yap {
             cutomization point.  This function is only defined if the
             configuration macro
             <code>BOOST_YAP_CONVERSION_OPERATOR_TEMPLATE</code> has been
-            defined by the user to be nonzero. */ // TODO
+            defined by the user to be nonzero. */
         template <typename R>
         operator R ()
         { return eval_expression_as(*this, hana::basic_type<R>{}); }
diff --git a/test/reference_returns.cpp b/test/reference_returns.cpp
index fc4673e..de08ec3 100644
--- a/test/reference_returns.cpp
+++ b/test/reference_returns.cpp
@@ -34,15 +34,6 @@ TEST(reference_returns, test_reference_returns)
     term<reference_returning::number> unity = {{1.0}};
     auto plus_expr = unity + reference_returning::number{1.0};
 
-    // TODO: This has to fail due to the general implicit conversion rules
-    // (see [conv]/3-6).  This needs to be noted in docs.
-#if 0
-    {
-        reference_returning::number const & n = plus_expr;
-        EXPECT_EQ(&n, &reference_returning::the_result);
-    }
-#endif
-
     {
         reference_returning::number const & n = evaluate(plus_expr);
         EXPECT_EQ(&n, &reference_returning::the_result);
diff --git a/test/user_expression_transform.cpp b/test/user_expression_transform.cpp
index 3c9dc41..43aeb5c 100644
--- a/test/user_expression_transform.cpp
+++ b/test/user_expression_transform.cpp
@@ -29,32 +29,6 @@ namespace user {
     number naxpy (number a, number x, number y)
     { return number{a.value * x.value + y.value + 10.0}; }
 
-#if 0 // TODO: Document this verbose form.
-    auto eval_expression_as (
-        yap::expression<
-            yap::expr_kind::plus,
-            bh::tuple<
-                yap::expression<
-                    yap::expr_kind::multiplies,
-                    bh::tuple<
-                        term<number>,
-                        term<number>
-                    >,
-                >,
-                term<number>
-            >
-        > const & expr,
-        boost::hana::basic_type<number>)
-    {
-        using namespace boost::hana::literals;
-        return naxpy(
-            expr.elements[0_c].elements[0_c].elements[0_c],
-            expr.elements[0_c].elements[1_c].elements[0_c],
-            expr.elements[1_c].elements[0_c]
-        );
-    }
-#endif
-
     decltype(auto) eval_expression_as (
         decltype(term<number>{{0.0}} * number{} + number{}) const & expr,
         boost::hana::basic_type<number>)