diff --git a/test/cfoa/emplace_tests.cpp b/test/cfoa/emplace_tests.cpp
index 0ecc66d4..ec2e1bc0 100644
--- a/test/cfoa/emplace_tests.cpp
+++ b/test/cfoa/emplace_tests.cpp
@@ -19,68 +19,30 @@ namespace {
     return x.emplace(v.x_);
   }
 
-  template <typename Container, typename Value>
-  bool member_emplace(Container& x, Value& v)
-  {
-    return x.emplace(v.x_);
-  }
-
   template <typename Container, typename Key, typename Value>
   bool member_emplace(Container& x, std::pair<Key, Value> const & v)
   {
     return x.emplace(v.first.x_, v.second.x_);
   }
 
-  template <typename Container, typename Key, typename Value>
-  bool member_emplace(Container& x, std::pair<Key, Value>& v)
-  {
-    return x.emplace(v.first.x_, v.second.x_);
-  }
-
-  template <typename Container, typename Value, typename F>
-  bool member_emplace_or_visit(Container& x, Value const & v, F f)
-  {
-    return x.emplace_or_visit(v.x_, f);
-  }
-
   template <typename Container, typename Value, typename F>
   bool member_emplace_or_visit(Container& x, Value& v, F f)
   {
     return x.emplace_or_visit(v.x_, f);
   }
 
-  template <typename Container, typename Key, typename Value, typename F>
-  bool member_emplace_or_visit(
-    Container& x, std::pair<Key, Value> const & v, F f)
-  {
-    return x.emplace_or_visit(v.first.x_, v.second.x_, f);
-  }
-
   template <typename Container, typename Key, typename Value, typename F>
   bool member_emplace_or_visit(Container& x, std::pair<Key, Value>& v, F f)
   {
     return x.emplace_or_visit(v.first.x_, v.second.x_, f);
   }
 
-  template <typename Container, typename Value, typename F>
-  bool member_emplace_or_cvisit(Container& x, Value const & v, F f)
-  {
-    return x.emplace_or_cvisit(v.x_, f);
-  }
-
   template <typename Container, typename Value, typename F>
   bool member_emplace_or_cvisit(Container& x, Value& v, F f)
   {
     return x.emplace_or_cvisit(v.x_, f);
   }
 
-  template <typename Container, typename Key, typename Value, typename F>
-  bool member_emplace_or_cvisit(
-    Container& x, std::pair<Key, Value> const & v, F f)
-  {
-    return x.emplace_or_cvisit(v.first.x_, v.second.x_, f);
-  }
-
   template <typename Container, typename Key, typename Value, typename F>
   bool member_emplace_or_cvisit(Container& x, std::pair<Key, Value>& v, F f)
   {