diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f248bdd..cd65a2b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ macro(fetch_content_from_submodule DEPNAME RELPATH)
   #   - another depencency of celerity-runtime that it transitively shares a depencency with (SimSYCL -> libenvpp)
   # The top-level CMake project must ensure that there are no conflicts between dependency versions in this case.
   if(${DEPNAME}_FOUND)
-    message(STATUS "Using system ${DEPNAME} in ${${DEPNAME}_DIR}")
+    message(STATUS "Using existing ${DEPNAME} in ${${DEPNAME}_DIR}, please ensure that the version (${${DEPNAME}_VERSION}) is compatible")
     set(CELERITY_DETAIL_USE_SYSTEM_${DEPNAME} ON)
   else()
     message(STATUS "Fetching ${DEPNAME} from submodule")
diff --git a/include/utils.h b/include/utils.h
index 26b13e56..c25e7fb3 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -41,17 +41,6 @@ auto as(P* p) {
 	return static_cast<std::conditional_t<std::is_const_v<P>, const T*, T*>>(p);
 }
 
-template <typename BitMaskT>
-constexpr inline uint32_t popcount(const BitMaskT bit_mask) noexcept {
-	static_assert(std::is_integral_v<BitMaskT> && std::is_unsigned_v<BitMaskT>, "popcount argument needs to be an unsigned integer type.");
-
-	uint32_t counter = 0;
-	for(auto b = bit_mask; b; b >>= 1) {
-		counter += b & 1;
-	}
-	return counter;
-}
-
 // Implementation from Boost.ContainerHash, licensed under the Boost Software License, Version 1.0.
 inline void hash_combine(std::size_t& seed, std::size_t value) { seed ^= value + 0x9e3779b9 + (seed << 6) + (seed >> 2); }
 
@@ -195,12 +184,6 @@ bool contains(const Container& container, const Key& key) {
 	}
 }
 
-template <typename Container, typename Predicate>
-void erase_if(Container& container, const Predicate& predicate) {
-	using std::begin, std::end;
-	container.erase(std::remove_if(begin(container), end(container), predicate), end(container));
-}
-
 /// Replaces all occurrences of `pattern` in `in` with `with`. If `pattern` is empty, returns the input string unchanged.
 std::string replace_all(const std::string_view& input, const std::string_view& pattern, const std::string_view& replacement);
 
diff --git a/vendor/libenvpp b/vendor/libenvpp
index 71c22b81..86db27f6 160000
--- a/vendor/libenvpp
+++ b/vendor/libenvpp
@@ -1 +1 @@
-Subproject commit 71c22b816f188a465d26586f89bec194aeb298a8
+Subproject commit 86db27f6df18a6e6a6ed143833bca0fd20977bf4