diff --git a/src/blackmisc/optional.h b/src/blackmisc/optional.h
index d2934c93d..1604075f4 100644
--- a/src/blackmisc/optional.h
+++ b/src/blackmisc/optional.h
@@ -121,7 +121,7 @@ namespace BlackMisc
      * Efficient swap for two Optional objects.
      */
     template <typename T>
-    void swap(Optional<T> &a, Optional<T> &b) noexcept(Private::is_nothrow_swappable<T, T>::value)
+    void swap(Optional<T> &a, Optional<T> &b) noexcept(std::is_nothrow_swappable_v<T>)
     {
         if (a)
         {
diff --git a/src/blackmisc/typetraits.h b/src/blackmisc/typetraits.h
index 122fd89cc..0c812ad83 100644
--- a/src/blackmisc/typetraits.h
+++ b/src/blackmisc/typetraits.h
@@ -23,19 +23,6 @@ namespace BlackMisc
 
     namespace Private
     {
-        //! \private Own implementation of C++17 std::is_nothrow_swappable.
-        template <typename T, typename U>
-        struct is_nothrow_swappable
-        {
-            static constexpr bool impl()
-            {
-                using std::swap;
-                return noexcept(swap(std::declval<T>(), std::declval<U>()))
-                    && noexcept(swap(std::declval<U>(), std::declval<T>()));
-            }
-            static constexpr bool value = impl();
-        };
-
         //! \private Dummy that derives from T if T is a class.
         template <typename T, bool = std::is_class_v<T>>
         struct SyntheticDerived : public T {};