diff --git a/README.md b/README.md
index 12b78952..65302974 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,8 @@ e.g.:
     specified scheduler`.
 - `let_value(sender, fun)` to produce a sender based on `sender`'s
     results.
-- `on(scheduler, sender)` to execute `sender` on `scheduler`.
-- `transfer(sender, scheduler)` to complete with with `sender`'s
+- `starts_on(scheduler, sender)` to start `sender` on `scheduler`.
+- `continues_on(sender, scheduler)` to complete with `sender`'s
     results on `scheduler`.
 - `when_all(sender ...)` to complete when all `sender`s have
     completed.
@@ -57,7 +57,6 @@ This project requires at least the following to build:
 
 * A C++ compiler that conforms to the C++23 standard or greater
 * CMake 3.30 or later
-* (Test Only) GoogleTest
 
 You can disable building tests by setting CMake option `BEMAN_EXECUTION_BUILD_TESTS` to
 `OFF` when configuring the project.
diff --git a/include/beman/execution/detail/set_value.hpp b/include/beman/execution/detail/set_value.hpp
index c2e4bdc4..541ee22e 100644
--- a/include/beman/execution/detail/set_value.hpp
+++ b/include/beman/execution/detail/set_value.hpp
@@ -12,19 +12,6 @@ import std;
 #include <utility>
 #endif
 
-// ----------------------------------------------------------------------------
-
-#define BEMAN_EXECUTION_SET_VALUE(rcvr, expr)                           \
-    [&]() noexcept(noexcept((expr))) -> void {                          \
-        if constexpr (::std::same_as<decltype((expr)), void>) {         \
-            (expr), ::beman::execution::set_value(::std::move((rcvr))); \
-        } else {                                                        \
-            ::beman::execution::set_value(::std::move((rcvr)), (expr)); \
-        }                                                               \
-    }()
-
-// ----------------------------------------------------------------------------
-
 namespace beman::execution {
 /*!
  * \brief Type of the customization point object for successful completions.
diff --git a/tests/beman/execution/exec-schedule-from.test.cpp b/tests/beman/execution/exec-schedule-from.test.cpp
index f8fb27e3..66f95879 100644
--- a/tests/beman/execution/exec-schedule-from.test.cpp
+++ b/tests/beman/execution/exec-schedule-from.test.cpp
@@ -11,7 +11,7 @@ import std;
 #ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
-#include <beman/execution/detail/schedules_from.hpp>
+#include <beman/execution/detail/schedule_from.hpp>
 #include <beman/execution.hpp>
 #endif
 
diff --git a/tests/beman/execution/exec-snd-expos.test.cpp b/tests/beman/execution/exec-snd-expos.test.cpp
index dcdde83c..e65642fe 100644
--- a/tests/beman/execution/exec-snd-expos.test.cpp
+++ b/tests/beman/execution/exec-snd-expos.test.cpp
@@ -192,34 +192,6 @@ struct receiver {
     auto set_stopped() noexcept -> void {}
 };
 
-// ------------------------------------------------------------------------
-
-template <typename T>
-struct set_value_test_receiver {
-    using receiver_concept = test_std::receiver_tag;
-    T&    single_arg;
-    bool& no_arg;
-    auto  set_value(auto&& value) noexcept -> void {
-        no_arg     = false;
-        single_arg = value;
-    }
-};
-
-auto test_set_value_macro() -> void {
-#ifdef BEMAN_EXECUTION_SET_VALUE
-    int  value{42};
-    bool no_arg{false};
-    ASSERT(value == 42);
-    ASSERT(not no_arg);
-    BEMAN_EXECUTION_SET_VALUE(set_value_test_receiver<int>{value, no_arg}, []() noexcept { return 43; }());
-    ASSERT(value == 43);
-    ASSERT(not no_arg);
-    BEMAN_EXECUTION_SET_VALUE(set_value_test_receiver<int>{value, no_arg}, []() noexcept {}());
-    ASSERT(value == 43);
-    ASSERT(no_arg);
-#endif
-}
-
 template <bool Expect, typename Query>
 auto test_fwd_env_helper() -> void {
     env e{42};
@@ -1293,7 +1265,6 @@ auto test_child_type() -> void {
 } // namespace
 
 TEST(exec_snd_expos) {
-    test_set_value_macro();
     test_fwd_env();
     test_make_env();
     test_join_env();
diff --git a/tests/beman/execution/exec-stop-when.test.cpp b/tests/beman/execution/exec-stop-when.test.cpp
index 9af65747..7b836af7 100644
--- a/tests/beman/execution/exec-stop-when.test.cpp
+++ b/tests/beman/execution/exec-stop-when.test.cpp
@@ -17,7 +17,6 @@ import beman.execution;
 import beman.execution.detail;
 #else
 #include <beman/execution/detail/stop_when.hpp>
-#include <beman/execution/detail/inplace_stop_token.hpp>
 #include <beman/execution/detail/sender.hpp>
 #include <beman/execution/detail/completion_signatures.hpp>
 #include <beman/execution/detail/set_value.hpp>