diff --git a/librf/src/event_v2.cpp b/librf/src/event_v2.cpp
index 2363ab1..0012403 100644
--- a/librf/src/event_v2.cpp
+++ b/librf/src/event_v2.cpp
@@ -200,10 +200,5 @@ namespace resumef
 		event_t::~event_t()
 		{
 		}
-
-		event_t::timeout_awaiter event_t::wait_until_(const clock_type::time_point& tp) const noexcept
-		{
-			return { tp, _event.get() };
-		}
 	}
 }
diff --git a/librf/src/event_v2.h b/librf/src/event_v2.h
index f0a4357..b7b50a1 100644
--- a/librf/src/event_v2.h
+++ b/librf/src/event_v2.h
@@ -215,18 +215,7 @@ namespace resumef
 			event_t& operator = (const event_t&) = default;
 			event_t& operator = (event_t&&) = default;
 		private:
-			//friend struct any_awaiter;
-
 			event_impl_ptr _event;
-
-			timeout_awaiter wait_until_(const clock_type::time_point& tp) const noexcept;
-			inline static bool is_all_succeeded(const std::vector<bool>& v)
-			{
-				return std::none_of(std::begin(v), std::end(v), [](auto v) 
-					{
-						return v == false;
-					});
-			}
 		};
 	}
 }
diff --git a/librf/src/event_v2.inl b/librf/src/event_v2.inl
index 0edbbf6..acae3c4 100644
--- a/librf/src/event_v2.inl
+++ b/librf/src/event_v2.inl
@@ -236,13 +236,15 @@ namespace resumef
 		template<class _Rep, class _Period>
 		inline event_t::timeout_awaiter event_t::wait_for(const std::chrono::duration<_Rep, _Period>& dt) const noexcept
 		{
-			return wait_until_(clock_type::now() + std::chrono::duration_cast<clock_type::duration>(dt));
+			clock_type::time_point tp2 = clock_type::now() + std::chrono::duration_cast<clock_type::duration>(dt);
+			return { tp2, _event.get() };
 		}
 
 		template<class _Clock, class _Duration>
 		inline event_t::timeout_awaiter event_t::wait_until(const std::chrono::time_point<_Clock, _Duration>& tp) const noexcept
 		{
-			return wait_until_(std::chrono::time_point_cast<clock_type::duration>(tp));
+			clock_type::time_point tp2 = std::chrono::time_point_cast<clock_type::duration>(tp);
+			return { tp2, _event.get() };
 		}