diff --git a/alib2std/src/extensions/container/map.hpp b/alib2std/src/extensions/container/map.hpp
index 416458d1737039e0456e92219c93ecde672da302..f5c58061b98cdfce10d0e4f2cb5f82f7aaf4c326 100644
--- a/alib2std/src/extensions/container/map.hpp
+++ b/alib2std/src/extensions/container/map.hpp
@@ -105,32 +105,6 @@ public:
 	 */
 	using iterator = typename std::map<T, R, Cmp, Alloc>::iterator;
 
-	/**
-	 * \brief
-	 * Temporary implementation of insert_or_assign from c++17 standard.
-	 * TODO: Remove this member function after move to C++17
-	 *
-	 * Follows interface from C++17 version of insert_or_assign
-	 *
-	 * \tparam M type of the value to insert
-	 *
-	 * \param k the key
-	 * \param obj the value
-	 *
-	 * \return pair of iterator to the inserted or assigned key-value pair and true if the value was inserted or false if the value was asigned
-	 */
-	template < typename M >
-	std::pair < iterator, bool > insert_or_assign ( const T & k, M && obj ) {
-		iterator pos = this->find ( k );
-		if ( pos == this->end ( ) ) {
-			pos = this->insert ( k, std::forward < M > ( obj ) ).first;
-			return std::make_pair ( pos, true );
-		} else {
-			pos->second = std::forward < M > ( obj );
-			return std::make_pair ( pos, false );
-		}
-	}
-
 	/**
 	 * \brief
 	 * Inherit all insert methods of the standard map.