Add env semantic

133 files changed, 0 insertions, 2730 deletions

diff --git a/library/cpp/CMakeLists.darwin-arm64.txt b/library/cpp/CMakeLists.darwin-arm64.txt
index b7794e3005..c48377c734 100644
--- a/library/cpp/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/CMakeLists.darwin-arm64.txt
@@ -19,7 +19,6 @@ add_subdirectory(cache)
 add_subdirectory(case_insensitive_string)
 add_subdirectory(cgiparam)
 add_subdirectory(charset)
-add_subdirectory(clickhouse)
 add_subdirectory(codecs)
 add_subdirectory(colorizer)
 add_subdirectory(compproto)
@@ -79,7 +78,6 @@ add_subdirectory(streams)
 add_subdirectory(string_utils)
 add_subdirectory(svnversion)
 add_subdirectory(tdigest)
-add_subdirectory(terminate_handler)
 add_subdirectory(testing)
 add_subdirectory(threading)
 add_subdirectory(time_provider)
diff --git a/library/cpp/CMakeLists.darwin-x86_64.txt b/library/cpp/CMakeLists.darwin-x86_64.txt
index ca80e3eed3..b7ca9ab05b 100644
--- a/library/cpp/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/CMakeLists.darwin-x86_64.txt
@@ -19,7 +19,6 @@ add_subdirectory(cache)
 add_subdirectory(case_insensitive_string)
 add_subdirectory(cgiparam)
 add_subdirectory(charset)
-add_subdirectory(clickhouse)
 add_subdirectory(codecs)
 add_subdirectory(colorizer)
 add_subdirectory(compproto)
@@ -80,7 +79,6 @@ add_subdirectory(streams)
 add_subdirectory(string_utils)
 add_subdirectory(svnversion)
 add_subdirectory(tdigest)
-add_subdirectory(terminate_handler)
 add_subdirectory(testing)
 add_subdirectory(threading)
 add_subdirectory(time_provider)
diff --git a/library/cpp/CMakeLists.linux-aarch64.txt b/library/cpp/CMakeLists.linux-aarch64.txt
index b7794e3005..c48377c734 100644
--- a/library/cpp/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/CMakeLists.linux-aarch64.txt
@@ -19,7 +19,6 @@ add_subdirectory(cache)
 add_subdirectory(case_insensitive_string)
 add_subdirectory(cgiparam)
 add_subdirectory(charset)
-add_subdirectory(clickhouse)
 add_subdirectory(codecs)
 add_subdirectory(colorizer)
 add_subdirectory(compproto)
@@ -79,7 +78,6 @@ add_subdirectory(streams)
 add_subdirectory(string_utils)
 add_subdirectory(svnversion)
 add_subdirectory(tdigest)
-add_subdirectory(terminate_handler)
 add_subdirectory(testing)
 add_subdirectory(threading)
 add_subdirectory(time_provider)
diff --git a/library/cpp/CMakeLists.linux-x86_64.txt b/library/cpp/CMakeLists.linux-x86_64.txt
index ca80e3eed3..b7ca9ab05b 100644
--- a/library/cpp/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/CMakeLists.linux-x86_64.txt
@@ -19,7 +19,6 @@ add_subdirectory(cache)
 add_subdirectory(case_insensitive_string)
 add_subdirectory(cgiparam)
 add_subdirectory(charset)
-add_subdirectory(clickhouse)
 add_subdirectory(codecs)
 add_subdirectory(colorizer)
 add_subdirectory(compproto)
@@ -80,7 +79,6 @@ add_subdirectory(streams)
 add_subdirectory(string_utils)
 add_subdirectory(svnversion)
 add_subdirectory(tdigest)
-add_subdirectory(terminate_handler)
 add_subdirectory(testing)
 add_subdirectory(threading)
 add_subdirectory(time_provider)
diff --git a/library/cpp/CMakeLists.windows-x86_64.txt b/library/cpp/CMakeLists.windows-x86_64.txt
index 772027a342..1f9560d50a 100644
--- a/library/cpp/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/CMakeLists.windows-x86_64.txt
@@ -78,7 +78,6 @@ add_subdirectory(streams)
 add_subdirectory(string_utils)
 add_subdirectory(svnversion)
 add_subdirectory(tdigest)
-add_subdirectory(terminate_handler)
 add_subdirectory(testing)
 add_subdirectory(threading)
 add_subdirectory(time_provider)
diff --git a/library/cpp/actors/core/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/core/ut/CMakeLists.darwin-arm64.txt
index 83199b12b6..ca8b9fc6aa 100644
--- a/library/cpp/actors/core/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.darwin-arm64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-core-ut)
 target_include_directories(library-cpp-actors-core-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core
 )
-target_link_libraries(library-cpp-actors-core-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-core-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -26,22 +18,6 @@ target_link_options(library-cpp-actors-core-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-core-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_coroutine_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/benchmark_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actorsystem_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/performance_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ask_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/balancer_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_payload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_basic_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_united_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/mon_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/scheduler_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut
@@ -75,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-core-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt
index e56713f557..ca8b9fc6aa 100644
--- a/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.darwin-x86_64.txt
@@ -11,15 +11,6 @@ add_executable(library-cpp-actors-core-ut)
 target_include_directories(library-cpp-actors-core-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core
 )
-target_link_libraries(library-cpp-actors-core-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-core-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -27,22 +18,6 @@ target_link_options(library-cpp-actors-core-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-core-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_coroutine_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/benchmark_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actorsystem_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/performance_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ask_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/balancer_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_payload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_basic_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_united_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/mon_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/scheduler_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut
@@ -76,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-core-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt
index bfd1f0f226..d602289424 100644
--- a/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.linux-aarch64.txt
@@ -11,15 +11,6 @@ add_executable(library-cpp-actors-core-ut)
 target_include_directories(library-cpp-actors-core-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core
 )
-target_link_libraries(library-cpp-actors-core-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-core-ut PRIVATE
   -ldl
   -lrt
@@ -30,22 +21,6 @@ target_link_options(library-cpp-actors-core-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-core-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_coroutine_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/benchmark_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actorsystem_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/performance_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ask_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/balancer_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_payload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_basic_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_united_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/mon_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/scheduler_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut
@@ -79,14 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-core-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt
index 145a291b45..d602289424 100644
--- a/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.linux-x86_64.txt
@@ -11,16 +11,6 @@ add_executable(library-cpp-actors-core-ut)
 target_include_directories(library-cpp-actors-core-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core
 )
-target_link_libraries(library-cpp-actors-core-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-core-ut PRIVATE
   -ldl
   -lrt
@@ -31,22 +21,6 @@ target_link_options(library-cpp-actors-core-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-core-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_coroutine_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/benchmark_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actorsystem_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/performance_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ask_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/balancer_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_payload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_basic_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_united_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/mon_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/scheduler_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut
@@ -80,15 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-core-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt
index 8e7e6bd499..e4aa23b6bb 100644
--- a/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/core/ut/CMakeLists.windows-x86_64.txt
@@ -11,31 +11,6 @@ add_executable(library-cpp-actors-core-ut)
 target_include_directories(library-cpp-actors-core-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/core
 )
-target_link_libraries(library-cpp-actors-core-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  cpp-actors-testlib
-)
-target_sources(library-cpp-actors-core-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_coroutine_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/benchmark_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/actorsystem_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/performance_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ask_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/balancer_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_payload_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/event_pb_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_basic_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/executor_pool_united_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/mon_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/scheduler_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut
@@ -69,14 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-core-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-core-ut)
diff --git a/library/cpp/actors/core/ut_fat/CMakeLists.darwin-arm64.txt b/library/cpp/actors/core/ut_fat/CMakeLists.darwin-arm64.txt
index c5420870b1..1c936d56a3 100644
--- a/library/cpp/actors/core/ut_fat/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/core/ut_fat/CMakeLists.darwin-arm64.txt
@@ -8,12 +8,6 @@
 
 
 add_executable(library-cpp-actors-core-ut_fat)
-target_link_libraries(library-cpp-actors-core-ut_fat PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -21,9 +15,6 @@ target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-core-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ut_fat/actor_benchmark.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut_fat
@@ -57,14 +48,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut_fat
-  PROPERTY
-  TIMEOUT
-  1200
-)
-target_allocator(library-cpp-actors-core-ut_fat
-  system_allocator
-)
 vcs_info(library-cpp-actors-core-ut_fat)
diff --git a/library/cpp/actors/core/ut_fat/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/core/ut_fat/CMakeLists.darwin-x86_64.txt
index 88a9860fc1..1c936d56a3 100644
--- a/library/cpp/actors/core/ut_fat/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/core/ut_fat/CMakeLists.darwin-x86_64.txt
@@ -8,13 +8,6 @@
 
 
 add_executable(library-cpp-actors-core-ut_fat)
-target_link_libraries(library-cpp-actors-core-ut_fat PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -22,9 +15,6 @@ target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-core-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ut_fat/actor_benchmark.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut_fat
@@ -58,14 +48,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut_fat
-  PROPERTY
-  TIMEOUT
-  1200
-)
-target_allocator(library-cpp-actors-core-ut_fat
-  system_allocator
-)
 vcs_info(library-cpp-actors-core-ut_fat)
diff --git a/library/cpp/actors/core/ut_fat/CMakeLists.linux-aarch64.txt b/library/cpp/actors/core/ut_fat/CMakeLists.linux-aarch64.txt
index 653d98fe60..81b67372d4 100644
--- a/library/cpp/actors/core/ut_fat/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/core/ut_fat/CMakeLists.linux-aarch64.txt
@@ -8,13 +8,6 @@
 
 
 add_executable(library-cpp-actors-core-ut_fat)
-target_link_libraries(library-cpp-actors-core-ut_fat PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -ldl
   -lrt
@@ -25,9 +18,6 @@ target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-core-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ut_fat/actor_benchmark.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut_fat
@@ -61,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut_fat
-  PROPERTY
-  TIMEOUT
-  1200
-)
-target_allocator(library-cpp-actors-core-ut_fat
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-core-ut_fat)
diff --git a/library/cpp/actors/core/ut_fat/CMakeLists.linux-x86_64.txt b/library/cpp/actors/core/ut_fat/CMakeLists.linux-x86_64.txt
index e929e6f394..81b67372d4 100644
--- a/library/cpp/actors/core/ut_fat/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/core/ut_fat/CMakeLists.linux-x86_64.txt
@@ -8,14 +8,6 @@
 
 
 add_executable(library-cpp-actors-core-ut_fat)
-target_link_libraries(library-cpp-actors-core-ut_fat PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -ldl
   -lrt
@@ -26,9 +18,6 @@ target_link_options(library-cpp-actors-core-ut_fat PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-core-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ut_fat/actor_benchmark.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut_fat
@@ -62,15 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut_fat
-  PROPERTY
-  TIMEOUT
-  1200
-)
-target_allocator(library-cpp-actors-core-ut_fat
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-core-ut_fat)
diff --git a/library/cpp/actors/core/ut_fat/CMakeLists.windows-x86_64.txt b/library/cpp/actors/core/ut_fat/CMakeLists.windows-x86_64.txt
index cd693cd949..d1f30c61a6 100644
--- a/library/cpp/actors/core/ut_fat/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/core/ut_fat/CMakeLists.windows-x86_64.txt
@@ -8,16 +8,6 @@
 
 
 add_executable(library-cpp-actors-core-ut_fat)
-target_link_libraries(library-cpp-actors-core-ut_fat PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-)
-target_sources(library-cpp-actors-core-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/core/ut_fat/actor_benchmark.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-core-ut_fat
@@ -51,14 +41,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-core-ut_fat
-  PROPERTY
-  TIMEOUT
-  1200
-)
-target_allocator(library-cpp-actors-core-ut_fat
-  system_allocator
-)
 vcs_info(library-cpp-actors-core-ut_fat)
diff --git a/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-arm64.txt
index 5ec40dbae9..8f40d460d6 100644
--- a/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-arm64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-cppcoro-ut)
 target_include_directories(library-cpp-actors-cppcoro-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro
 )
-target_link_libraries(library-cpp-actors-cppcoro-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-cppcoro
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -25,10 +18,6 @@ target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-cppcoro-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-cppcoro-ut
@@ -62,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-cppcoro-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-cppcoro-ut)
diff --git a/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-x86_64.txt
index 7cebff01de..8f40d460d6 100644
--- a/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/cppcoro/ut/CMakeLists.darwin-x86_64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-cppcoro-ut)
 target_include_directories(library-cpp-actors-cppcoro-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro
 )
-target_link_libraries(library-cpp-actors-cppcoro-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-cppcoro
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -26,10 +18,6 @@ target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-cppcoro-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-cppcoro-ut
@@ -63,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-cppcoro-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-cppcoro-ut)
diff --git a/library/cpp/actors/cppcoro/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/cppcoro/ut/CMakeLists.linux-aarch64.txt
index 4a11af3456..634a36939c 100644
--- a/library/cpp/actors/cppcoro/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/cppcoro/ut/CMakeLists.linux-aarch64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-cppcoro-ut)
 target_include_directories(library-cpp-actors-cppcoro-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro
 )
-target_link_libraries(library-cpp-actors-cppcoro-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-cppcoro
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -ldl
   -lrt
@@ -29,10 +21,6 @@ target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-cppcoro-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-cppcoro-ut
@@ -66,7 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-cppcoro-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-cppcoro-ut)
diff --git a/library/cpp/actors/cppcoro/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/cppcoro/ut/CMakeLists.linux-x86_64.txt
index 2e2412f989..634a36939c 100644
--- a/library/cpp/actors/cppcoro/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/cppcoro/ut/CMakeLists.linux-x86_64.txt
@@ -11,15 +11,6 @@ add_executable(library-cpp-actors-cppcoro-ut)
 target_include_directories(library-cpp-actors-cppcoro-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro
 )
-target_link_libraries(library-cpp-actors-cppcoro-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-cppcoro
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -ldl
   -lrt
@@ -30,10 +21,6 @@ target_link_options(library-cpp-actors-cppcoro-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-cppcoro-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-cppcoro-ut
@@ -67,8 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-cppcoro-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-cppcoro-ut)
diff --git a/library/cpp/actors/cppcoro/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/cppcoro/ut/CMakeLists.windows-x86_64.txt
index e3b8b019c8..3bf04e1a20 100644
--- a/library/cpp/actors/cppcoro/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/cppcoro/ut/CMakeLists.windows-x86_64.txt
@@ -11,18 +11,6 @@ add_executable(library-cpp-actors-cppcoro-ut)
 target_include_directories(library-cpp-actors-cppcoro-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro
 )
-target_link_libraries(library-cpp-actors-cppcoro-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-cppcoro
-  cpp-actors-testlib
-)
-target_sources(library-cpp-actors-cppcoro-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/cppcoro/task_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-cppcoro-ut
@@ -56,7 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-cppcoro-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-cppcoro-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-arm64.txt
index 8874bee8e5..de9826f4dc 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-arm64.txt
@@ -12,13 +12,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver
   ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include
 )
-target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-dnsresolver
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -26,11 +19,6 @@ target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-dnsresolver-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_caching_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ondemand_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-dnsresolver-ut
@@ -64,7 +52,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-dnsresolver-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt
index 9e092bba80..de9826f4dc 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.darwin-x86_64.txt
@@ -12,14 +12,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver
   ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include
 )
-target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-dnsresolver
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -27,11 +19,6 @@ target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-dnsresolver-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_caching_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ondemand_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-dnsresolver-ut
@@ -65,7 +52,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-dnsresolver-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt
index c8eb27acd0..2db729069e 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-aarch64.txt
@@ -12,14 +12,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver
   ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include
 )
-target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-dnsresolver
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -ldl
   -lrt
@@ -30,11 +22,6 @@ target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-dnsresolver-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_caching_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ondemand_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-dnsresolver-ut
@@ -68,7 +55,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-dnsresolver-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt
index eae7bc85a3..2db729069e 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.linux-x86_64.txt
@@ -12,15 +12,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver
   ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include
 )
-target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-dnsresolver
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -ldl
   -lrt
@@ -31,11 +22,6 @@ target_link_options(library-cpp-actors-dnsresolver-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-dnsresolver-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_caching_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ondemand_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-dnsresolver-ut
@@ -69,8 +55,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-dnsresolver-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt
index 7705d206a3..c14ae6f696 100644
--- a/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/dnsresolver/ut/CMakeLists.windows-x86_64.txt
@@ -12,19 +12,6 @@ target_include_directories(library-cpp-actors-dnsresolver-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver
   ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include
 )
-target_link_libraries(library-cpp-actors-dnsresolver-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-dnsresolver
-  cpp-actors-testlib
-)
-target_sources(library-cpp-actors-dnsresolver-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_caching_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ondemand_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/dnsresolver/dnsresolver_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-dnsresolver-ut
@@ -58,7 +45,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-dnsresolver-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-dnsresolver-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/helpers/ut/CMakeLists.darwin-arm64.txt
index 0112181222..53744800de 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.darwin-arm64.txt
@@ -11,15 +11,6 @@ add_executable(library-cpp-actors-helpers-ut)
 target_include_directories(library-cpp-actors-helpers-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers
 )
-target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-helpers
-  cpp-actors-interconnect
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -27,9 +18,6 @@ target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-helpers-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers/selfping_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-helpers-ut
@@ -63,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-helpers-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-helpers-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt
index 126b29e574..53744800de 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.darwin-x86_64.txt
@@ -11,16 +11,6 @@ add_executable(library-cpp-actors-helpers-ut)
 target_include_directories(library-cpp-actors-helpers-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers
 )
-target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-helpers
-  cpp-actors-interconnect
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -28,9 +18,6 @@ target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-helpers-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers/selfping_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-helpers-ut
@@ -64,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-helpers-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-helpers-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt
index 24da0dacd6..17bab8cd76 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.linux-aarch64.txt
@@ -11,16 +11,6 @@ add_executable(library-cpp-actors-helpers-ut)
 target_include_directories(library-cpp-actors-helpers-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers
 )
-target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-helpers
-  cpp-actors-interconnect
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -ldl
   -lrt
@@ -31,9 +21,6 @@ target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-helpers-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers/selfping_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-helpers-ut
@@ -67,14 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-helpers-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-helpers-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt
index db118dc91e..17bab8cd76 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.linux-x86_64.txt
@@ -11,17 +11,6 @@ add_executable(library-cpp-actors-helpers-ut)
 target_include_directories(library-cpp-actors-helpers-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers
 )
-target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-helpers
-  cpp-actors-interconnect
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -ldl
   -lrt
@@ -32,9 +21,6 @@ target_link_options(library-cpp-actors-helpers-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-helpers-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers/selfping_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-helpers-ut
@@ -68,15 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-helpers-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-helpers-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt
index 7e68870a0e..274af7059c 100644
--- a/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/helpers/ut/CMakeLists.windows-x86_64.txt
@@ -11,19 +11,6 @@ add_executable(library-cpp-actors-helpers-ut)
 target_include_directories(library-cpp-actors-helpers-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers
 )
-target_link_libraries(library-cpp-actors-helpers-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-helpers
-  cpp-actors-interconnect
-  cpp-actors-testlib
-  cpp-actors-core
-)
-target_sources(library-cpp-actors-helpers-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/helpers/selfping_actor_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-helpers-ut
@@ -57,14 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-helpers-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-helpers-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-helpers-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/http/ut/CMakeLists.darwin-arm64.txt
index f9c9afac61..cef340e2b9 100644
--- a/library/cpp/actors/http/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.darwin-arm64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-http-ut)
 target_include_directories(library-cpp-actors-http-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/http
 )
-target_link_libraries(library-cpp-actors-http-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-http
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-http-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -25,9 +18,6 @@ target_link_options(library-cpp-actors-http-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-http-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/http/http_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-http-ut
@@ -61,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-http-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt
index 99677acae5..cef340e2b9 100644
--- a/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.darwin-x86_64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-http-ut)
 target_include_directories(library-cpp-actors-http-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/http
 )
-target_link_libraries(library-cpp-actors-http-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-http
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-http-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -26,9 +18,6 @@ target_link_options(library-cpp-actors-http-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-http-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/http/http_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-http-ut
@@ -62,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-http-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt
index 8818e4418f..c7c67d7056 100644
--- a/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.linux-aarch64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-http-ut)
 target_include_directories(library-cpp-actors-http-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/http
 )
-target_link_libraries(library-cpp-actors-http-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-http
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-http-ut PRIVATE
   -ldl
   -lrt
@@ -29,9 +21,6 @@ target_link_options(library-cpp-actors-http-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-http-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/http/http_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-http-ut
@@ -65,7 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-http-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt
index 620f66ad00..c7c67d7056 100644
--- a/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.linux-x86_64.txt
@@ -11,15 +11,6 @@ add_executable(library-cpp-actors-http-ut)
 target_include_directories(library-cpp-actors-http-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/http
 )
-target_link_libraries(library-cpp-actors-http-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-http
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-http-ut PRIVATE
   -ldl
   -lrt
@@ -30,9 +21,6 @@ target_link_options(library-cpp-actors-http-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-http-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/http/http_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-http-ut
@@ -66,8 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-http-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt
index 73603d626c..2ad6967c21 100644
--- a/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/http/ut/CMakeLists.windows-x86_64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-http-ut)
 target_include_directories(library-cpp-actors-http-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/http
 )
-target_link_libraries(library-cpp-actors-http-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-http
-  cpp-actors-testlib
-)
 set_property(
   TARGET
   library-cpp-actors-http-ut
@@ -52,7 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-http-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-http-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.darwin-arm64.txt
index 0b2d5cfe5c..3c1933339f 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.darwin-arm64.txt
@@ -6,22 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(lib)
-add_subdirectory(protos)
 
 add_executable(library-cpp-actors-interconnect-ut)
-target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-actors-testlib
-  cpp-digest-md5
-  cpp-testing-unittest
-)
 target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -29,16 +15,6 @@ target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-interconnect-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/interconnect_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/large.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/outgoing_stream_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/dynamic_proxy_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/sticking_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut
@@ -72,14 +48,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt
index 7519ee7ba9..3c1933339f 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.darwin-x86_64.txt
@@ -6,23 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(lib)
-add_subdirectory(protos)
 
 add_executable(library-cpp-actors-interconnect-ut)
-target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-actors-testlib
-  cpp-digest-md5
-  cpp-testing-unittest
-)
 target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -30,16 +15,6 @@ target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-interconnect-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/interconnect_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/large.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/outgoing_stream_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/dynamic_proxy_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/sticking_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut
@@ -73,14 +48,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt
index 1d488c4550..6b25802790 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.linux-aarch64.txt
@@ -6,23 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(lib)
-add_subdirectory(protos)
 
 add_executable(library-cpp-actors-interconnect-ut)
-target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-actors-testlib
-  cpp-digest-md5
-  cpp-testing-unittest
-)
 target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -ldl
   -lrt
@@ -33,16 +18,6 @@ target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-interconnect-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/interconnect_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/large.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/outgoing_stream_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/dynamic_proxy_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/sticking_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut
@@ -76,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt
index 3ee5b5f656..6b25802790 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.linux-x86_64.txt
@@ -6,24 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(lib)
-add_subdirectory(protos)
 
 add_executable(library-cpp-actors-interconnect-ut)
-target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-actors-testlib
-  cpp-digest-md5
-  cpp-testing-unittest
-)
 target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -ldl
   -lrt
@@ -34,16 +18,6 @@ target_link_options(library-cpp-actors-interconnect-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-interconnect-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/interconnect_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/large.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/outgoing_stream_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/dynamic_proxy_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/sticking_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut
@@ -77,15 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt
index b928771974..4612472bf4 100644
--- a/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut/CMakeLists.windows-x86_64.txt
@@ -6,33 +6,8 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(lib)
-add_subdirectory(protos)
 
 add_executable(library-cpp-actors-interconnect-ut)
-target_link_libraries(library-cpp-actors-interconnect-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-actors-testlib
-  cpp-digest-md5
-  cpp-testing-unittest
-)
-target_sources(library-cpp-actors-interconnect-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/channel_scheduler_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/event_holder_pool_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/interconnect_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/large.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/outgoing_stream_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/poller_actor_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/dynamic_proxy_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/sticking_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut
@@ -66,14 +41,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut)
diff --git a/library/cpp/actors/interconnect/ut/lib/CMakeLists.darwin-arm64.txt b/library/cpp/actors/interconnect/ut/lib/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index a6a86ac09b..0000000000
--- a/library/cpp/actors/interconnect/ut/lib/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(interconnect-ut-lib INTERFACE)
-target_link_libraries(interconnect-ut-lib INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/library/cpp/actors/interconnect/ut/lib/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut/lib/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index a6a86ac09b..0000000000
--- a/library/cpp/actors/interconnect/ut/lib/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(interconnect-ut-lib INTERFACE)
-target_link_libraries(interconnect-ut-lib INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/library/cpp/actors/interconnect/ut/lib/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut/lib/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index b20c3b0de9..0000000000
--- a/library/cpp/actors/interconnect/ut/lib/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(interconnect-ut-lib INTERFACE)
-target_link_libraries(interconnect-ut-lib INTERFACE
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/library/cpp/actors/interconnect/ut/lib/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut/lib/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index b20c3b0de9..0000000000
--- a/library/cpp/actors/interconnect/ut/lib/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(interconnect-ut-lib INTERFACE)
-target_link_libraries(interconnect-ut-lib INTERFACE
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/library/cpp/actors/interconnect/ut/lib/CMakeLists.txt b/library/cpp/actors/interconnect/ut/lib/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/actors/interconnect/ut/lib/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/actors/interconnect/ut/lib/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut/lib/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index a6a86ac09b..0000000000
--- a/library/cpp/actors/interconnect/ut/lib/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(interconnect-ut-lib INTERFACE)
-target_link_libraries(interconnect-ut-lib INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/library/cpp/actors/interconnect/ut/protos/CMakeLists.darwin-arm64.txt b/library/cpp/actors/interconnect/ut/protos/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 01f1765c08..0000000000
--- a/library/cpp/actors/interconnect/ut/protos/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-
-add_library(interconnect-ut-protos)
-target_link_libraries(interconnect-ut-protos PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-)
-target_proto_messages(interconnect-ut-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/protos/interconnect_test.proto
-)
-target_proto_addincls(interconnect-ut-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(interconnect-ut-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
diff --git a/library/cpp/actors/interconnect/ut/protos/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut/protos/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 01f1765c08..0000000000
--- a/library/cpp/actors/interconnect/ut/protos/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-
-add_library(interconnect-ut-protos)
-target_link_libraries(interconnect-ut-protos PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-)
-target_proto_messages(interconnect-ut-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/protos/interconnect_test.proto
-)
-target_proto_addincls(interconnect-ut-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(interconnect-ut-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
diff --git a/library/cpp/actors/interconnect/ut/protos/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut/protos/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 10cf33244c..0000000000
--- a/library/cpp/actors/interconnect/ut/protos/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-
-add_library(interconnect-ut-protos)
-target_link_libraries(interconnect-ut-protos PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-)
-target_proto_messages(interconnect-ut-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/protos/interconnect_test.proto
-)
-target_proto_addincls(interconnect-ut-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(interconnect-ut-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
diff --git a/library/cpp/actors/interconnect/ut/protos/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut/protos/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 10cf33244c..0000000000
--- a/library/cpp/actors/interconnect/ut/protos/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-
-add_library(interconnect-ut-protos)
-target_link_libraries(interconnect-ut-protos PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-)
-target_proto_messages(interconnect-ut-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/protos/interconnect_test.proto
-)
-target_proto_addincls(interconnect-ut-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(interconnect-ut-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
diff --git a/library/cpp/actors/interconnect/ut/protos/CMakeLists.txt b/library/cpp/actors/interconnect/ut/protos/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/actors/interconnect/ut/protos/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/actors/interconnect/ut/protos/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut/protos/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index 01f1765c08..0000000000
--- a/library/cpp/actors/interconnect/ut/protos/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-get_built_tool_path(
-  TOOL_protoc_bin
-  TOOL_protoc_dependency
-  contrib/tools/protoc/bin
-  protoc
-)
-get_built_tool_path(
-  TOOL_cpp_styleguide_bin
-  TOOL_cpp_styleguide_dependency
-  contrib/tools/protoc/plugins/cpp_styleguide
-  cpp_styleguide
-)
-
-add_library(interconnect-ut-protos)
-target_link_libraries(interconnect-ut-protos PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-)
-target_proto_messages(interconnect-ut-protos PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut/protos/interconnect_test.proto
-)
-target_proto_addincls(interconnect-ut-protos
-  ./
-  ${CMAKE_SOURCE_DIR}/
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
-)
-target_proto_outs(interconnect-ut-protos
-  --cpp_out=${CMAKE_BINARY_DIR}/
-  --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
-)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-arm64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-arm64.txt
index ad106fc729..66eca10ca8 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-arm64.txt
@@ -8,18 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_fat)
-target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  actors-interconnect-mock
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-deprecated-atomic
-)
 target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -27,9 +15,6 @@ target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-interconnect-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_fat/main.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_fat
@@ -63,7 +48,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-interconnect-ut_fat
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt
index 4285513499..66eca10ca8 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.darwin-x86_64.txt
@@ -8,19 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_fat)
-target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  actors-interconnect-mock
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-deprecated-atomic
-)
 target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -28,9 +15,6 @@ target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-interconnect-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_fat/main.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_fat
@@ -64,7 +48,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-interconnect-ut_fat
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt
index 5365ba4e24..f4ab468667 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-aarch64.txt
@@ -8,19 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_fat)
-target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  actors-interconnect-mock
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-deprecated-atomic
-)
 target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -ldl
   -lrt
@@ -31,9 +18,6 @@ target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-interconnect-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_fat/main.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_fat
@@ -67,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-interconnect-ut_fat
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt
index 86ef393bab..f4ab468667 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.linux-x86_64.txt
@@ -8,20 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_fat)
-target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  actors-interconnect-mock
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-deprecated-atomic
-)
 target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -ldl
   -lrt
@@ -32,9 +18,6 @@ target_link_options(library-cpp-actors-interconnect-ut_fat PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-interconnect-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_fat/main.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_fat
@@ -68,8 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-interconnect-ut_fat
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt
index 3841949a28..0a3fbb74e4 100644
--- a/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_fat/CMakeLists.windows-x86_64.txt
@@ -8,22 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_fat)
-target_link_libraries(library-cpp-actors-interconnect-ut_fat PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  actors-interconnect-mock
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-deprecated-atomic
-)
-target_sources(library-cpp-actors-interconnect-ut_fat PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_fat/main.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_fat
@@ -57,7 +41,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-interconnect-ut_fat
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut_fat)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-arm64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-arm64.txt
index b91e1530bb..c37a08c03f 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-arm64.txt
@@ -8,17 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
-target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -26,9 +15,6 @@ target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_huge_cluster/huge_cluster.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_huge_cluster
@@ -62,14 +48,4 @@ set_yunittest_property(
   PROCESSORS
   4
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut_huge_cluster
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt
index 45fd7e2060..c37a08c03f 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.darwin-x86_64.txt
@@ -8,18 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
-target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -27,9 +15,6 @@ target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_huge_cluster/huge_cluster.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_huge_cluster
@@ -63,14 +48,4 @@ set_yunittest_property(
   PROCESSORS
   4
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut_huge_cluster
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt
index 51c8af6a26..930b239c42 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-aarch64.txt
@@ -8,18 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
-target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -ldl
   -lrt
@@ -30,9 +18,6 @@ target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_huge_cluster/huge_cluster.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_huge_cluster
@@ -66,14 +51,4 @@ set_yunittest_property(
   PROCESSORS
   4
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut_huge_cluster
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt
index 97a04cc102..930b239c42 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.linux-x86_64.txt
@@ -8,19 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
-target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-actors-testlib
-)
 target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -ldl
   -lrt
@@ -31,9 +18,6 @@ target_link_options(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_huge_cluster/huge_cluster.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_huge_cluster
@@ -67,15 +51,4 @@ set_yunittest_property(
   PROCESSORS
   4
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut_huge_cluster
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt
index 7155e17cd5..f2294f78a0 100644
--- a/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/interconnect/ut_huge_cluster/CMakeLists.windows-x86_64.txt
@@ -8,21 +8,6 @@
 
 
 add_executable(library-cpp-actors-interconnect-ut_huge_cluster)
-target_link_libraries(library-cpp-actors-interconnect-ut_huge_cluster PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-core
-  cpp-actors-interconnect
-  interconnect-ut-lib
-  interconnect-ut-protos
-  cpp-testing-unittest
-  cpp-actors-testlib
-)
-target_sources(library-cpp-actors-interconnect-ut_huge_cluster PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/interconnect/ut_huge_cluster/huge_cluster.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-interconnect-ut_huge_cluster
@@ -56,14 +41,4 @@ set_yunittest_property(
   PROCESSORS
   4
 )
-set_yunittest_property(
-  TEST
-  library-cpp-actors-interconnect-ut_huge_cluster
-  PROPERTY
-  TIMEOUT
-  600
-)
-target_allocator(library-cpp-actors-interconnect-ut_huge_cluster
-  system_allocator
-)
 vcs_info(library-cpp-actors-interconnect-ut_huge_cluster)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/prof/ut/CMakeLists.darwin-arm64.txt
index 44995c4d4b..d6bff3e11c 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.darwin-arm64.txt
@@ -11,12 +11,6 @@ add_executable(library-cpp-actors-prof-ut)
 target_include_directories(library-cpp-actors-prof-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof
 )
-target_link_libraries(library-cpp-actors-prof-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-prof
-)
 target_link_options(library-cpp-actors-prof-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -24,9 +18,6 @@ target_link_options(library-cpp-actors-prof-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-prof-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof/ut/tag_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-prof-ut
@@ -60,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-prof-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt
index 0ec56d8762..d6bff3e11c 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.darwin-x86_64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-prof-ut)
 target_include_directories(library-cpp-actors-prof-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof
 )
-target_link_libraries(library-cpp-actors-prof-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-prof
-)
 target_link_options(library-cpp-actors-prof-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -25,9 +18,6 @@ target_link_options(library-cpp-actors-prof-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-prof-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof/ut/tag_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-prof-ut
@@ -61,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-prof-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt
index 591055b744..8a2bcb66b7 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.linux-aarch64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-prof-ut)
 target_include_directories(library-cpp-actors-prof-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof
 )
-target_link_libraries(library-cpp-actors-prof-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-prof
-)
 target_link_options(library-cpp-actors-prof-ut PRIVATE
   -ldl
   -lrt
@@ -28,9 +21,6 @@ target_link_options(library-cpp-actors-prof-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-prof-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof/ut/tag_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-prof-ut
@@ -64,7 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-prof-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt
index 7c84eda1b0..8a2bcb66b7 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.linux-x86_64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-prof-ut)
 target_include_directories(library-cpp-actors-prof-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof
 )
-target_link_libraries(library-cpp-actors-prof-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-prof
-)
 target_link_options(library-cpp-actors-prof-ut PRIVATE
   -ldl
   -lrt
@@ -29,9 +21,6 @@ target_link_options(library-cpp-actors-prof-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-prof-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof/ut/tag_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-prof-ut
@@ -65,8 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-prof-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt
index 3165130380..e55e140515 100644
--- a/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/prof/ut/CMakeLists.windows-x86_64.txt
@@ -11,16 +11,6 @@ add_executable(library-cpp-actors-prof-ut)
 target_include_directories(library-cpp-actors-prof-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof
 )
-target_link_libraries(library-cpp-actors-prof-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-prof
-)
-target_sources(library-cpp-actors-prof-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/prof/ut/tag_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-prof-ut
@@ -54,7 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-prof-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-prof-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/testlib/ut/CMakeLists.darwin-arm64.txt
index ae1df12ed6..89c8ba99c7 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.darwin-arm64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-testlib-ut)
 target_include_directories(library-cpp-actors-testlib-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib
 )
-target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -25,9 +18,6 @@ target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-testlib-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib/decorator_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-testlib-ut
@@ -61,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-testlib-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt
index 03d106c63f..89c8ba99c7 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.darwin-x86_64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-testlib-ut)
 target_include_directories(library-cpp-actors-testlib-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib
 )
-target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -26,9 +18,6 @@ target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-testlib-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib/decorator_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-testlib-ut
@@ -62,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-testlib-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt
index 598b6e53de..36ab768399 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.linux-aarch64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-testlib-ut)
 target_include_directories(library-cpp-actors-testlib-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib
 )
-target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -ldl
   -lrt
@@ -29,9 +21,6 @@ target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-testlib-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib/decorator_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-testlib-ut
@@ -65,7 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-testlib-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt
index 42713842da..36ab768399 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.linux-x86_64.txt
@@ -11,15 +11,6 @@ add_executable(library-cpp-actors-testlib-ut)
 target_include_directories(library-cpp-actors-testlib-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib
 )
-target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-testlib
-  cpp-actors-core
-)
 target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -ldl
   -lrt
@@ -30,9 +21,6 @@ target_link_options(library-cpp-actors-testlib-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-testlib-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib/decorator_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-testlib-ut
@@ -66,8 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-testlib-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt
index 077ccae7fb..084b0187b2 100644
--- a/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/testlib/ut/CMakeLists.windows-x86_64.txt
@@ -11,17 +11,6 @@ add_executable(library-cpp-actors-testlib-ut)
 target_include_directories(library-cpp-actors-testlib-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib
 )
-target_link_libraries(library-cpp-actors-testlib-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-testlib
-  cpp-actors-core
-)
-target_sources(library-cpp-actors-testlib-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/testlib/decorator_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-testlib-ut
@@ -55,7 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-testlib-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-testlib-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.darwin-arm64.txt b/library/cpp/actors/util/ut/CMakeLists.darwin-arm64.txt
index 9b02cd1836..9aa18545ca 100644
--- a/library/cpp/actors/util/ut/CMakeLists.darwin-arm64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.darwin-arm64.txt
@@ -11,12 +11,6 @@ add_executable(library-cpp-actors-util-ut)
 target_include_directories(library-cpp-actors-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util
 )
-target_link_libraries(library-cpp-actors-util-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-util
-)
 target_link_options(library-cpp-actors-util-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -24,17 +18,6 @@ target_link_options(library-cpp-actors-util-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-util-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/cpu_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_tracker_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/thread_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rope_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rc_buf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_native_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/unordered_cache_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-util-ut
@@ -68,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-util-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt b/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt
index f02b2d926c..9aa18545ca 100644
--- a/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.darwin-x86_64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-util-ut)
 target_include_directories(library-cpp-actors-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util
 )
-target_link_libraries(library-cpp-actors-util-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-util
-)
 target_link_options(library-cpp-actors-util-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
@@ -25,17 +18,6 @@ target_link_options(library-cpp-actors-util-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(library-cpp-actors-util-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/cpu_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_tracker_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/thread_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rope_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rc_buf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_native_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/unordered_cache_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-util-ut
@@ -69,7 +51,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-util-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt b/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt
index 27ff864fef..720db82e4b 100644
--- a/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.linux-aarch64.txt
@@ -11,13 +11,6 @@ add_executable(library-cpp-actors-util-ut)
 target_include_directories(library-cpp-actors-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util
 )
-target_link_libraries(library-cpp-actors-util-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest_main
-  cpp-actors-util
-)
 target_link_options(library-cpp-actors-util-ut PRIVATE
   -ldl
   -lrt
@@ -28,17 +21,6 @@ target_link_options(library-cpp-actors-util-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-util-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/cpu_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_tracker_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/thread_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rope_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rc_buf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_native_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/unordered_cache_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-util-ut
@@ -72,7 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-util-ut
-  cpp-malloc-jemalloc
-)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt b/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt
index d1143a475b..720db82e4b 100644
--- a/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.linux-x86_64.txt
@@ -11,14 +11,6 @@ add_executable(library-cpp-actors-util-ut)
 target_include_directories(library-cpp-actors-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util
 )
-target_link_libraries(library-cpp-actors-util-ut PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-util
-)
 target_link_options(library-cpp-actors-util-ut PRIVATE
   -ldl
   -lrt
@@ -29,17 +21,6 @@ target_link_options(library-cpp-actors-util-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(library-cpp-actors-util-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/cpu_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_tracker_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/thread_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rope_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rc_buf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_native_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/unordered_cache_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-util-ut
@@ -73,8 +54,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-util-ut
-  cpp-malloc-tcmalloc
-  libs-tcmalloc-no_percpu_cache
-)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt b/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt
index 3af5d98ef0..56a3bb54d8 100644
--- a/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt
+++ b/library/cpp/actors/util/ut/CMakeLists.windows-x86_64.txt
@@ -11,24 +11,6 @@ add_executable(library-cpp-actors-util-ut)
 target_include_directories(library-cpp-actors-util-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/library/cpp/actors/util
 )
-target_link_libraries(library-cpp-actors-util-ut PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  library-cpp-cpuid_check
-  cpp-testing-unittest_main
-  cpp-actors-util
-)
-target_sources(library-cpp-actors-util-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/cpu_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/memory_tracker_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/thread_load_log_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rope_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/rc_buf_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/shared_data_native_rope_backend_ut.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/actors/util/unordered_cache_ut.cpp
-)
 set_property(
   TARGET
   library-cpp-actors-util-ut
@@ -62,7 +44,4 @@ set_yunittest_property(
   PROCESSORS
   1
 )
-target_allocator(library-cpp-actors-util-ut
-  system_allocator
-)
 vcs_info(library-cpp-actors-util-ut)
diff --git a/library/cpp/clickhouse/CMakeLists.darwin-arm64.txt b/library/cpp/clickhouse/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 7f79107ebc..0000000000
--- a/library/cpp/clickhouse/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(client)
diff --git a/library/cpp/clickhouse/CMakeLists.darwin-x86_64.txt b/library/cpp/clickhouse/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 7f79107ebc..0000000000
--- a/library/cpp/clickhouse/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(client)
diff --git a/library/cpp/clickhouse/CMakeLists.linux-aarch64.txt b/library/cpp/clickhouse/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 7f79107ebc..0000000000
--- a/library/cpp/clickhouse/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(client)
diff --git a/library/cpp/clickhouse/CMakeLists.linux-x86_64.txt b/library/cpp/clickhouse/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 7f79107ebc..0000000000
--- a/library/cpp/clickhouse/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(client)
diff --git a/library/cpp/clickhouse/CMakeLists.txt b/library/cpp/clickhouse/CMakeLists.txt
deleted file mode 100644
index 1beba2829f..0000000000
--- a/library/cpp/clickhouse/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/clickhouse/client/CMakeLists.darwin-arm64.txt b/library/cpp/clickhouse/client/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index d31f838946..0000000000
--- a/library/cpp/clickhouse/client/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(base)
-add_subdirectory(columns)
-add_subdirectory(types)
-
-add_library(cpp-clickhouse-client)
-target_link_libraries(cpp-clickhouse-client PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-lz4
-  contrib-restricted-cityhash-1.0.2
-  clickhouse-client-base
-  clickhouse-client-columns
-  clickhouse-client-types
-  cpp-openssl-io
-)
-target_sources(cpp-clickhouse-client PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/block.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/client.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/query.cpp
-)
diff --git a/library/cpp/clickhouse/client/CMakeLists.darwin-x86_64.txt b/library/cpp/clickhouse/client/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index d31f838946..0000000000
--- a/library/cpp/clickhouse/client/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(base)
-add_subdirectory(columns)
-add_subdirectory(types)
-
-add_library(cpp-clickhouse-client)
-target_link_libraries(cpp-clickhouse-client PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-lz4
-  contrib-restricted-cityhash-1.0.2
-  clickhouse-client-base
-  clickhouse-client-columns
-  clickhouse-client-types
-  cpp-openssl-io
-)
-target_sources(cpp-clickhouse-client PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/block.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/client.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/query.cpp
-)
diff --git a/library/cpp/clickhouse/client/CMakeLists.linux-aarch64.txt b/library/cpp/clickhouse/client/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index f86df04097..0000000000
--- a/library/cpp/clickhouse/client/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(base)
-add_subdirectory(columns)
-add_subdirectory(types)
-
-add_library(cpp-clickhouse-client)
-target_link_libraries(cpp-clickhouse-client PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-lz4
-  contrib-restricted-cityhash-1.0.2
-  clickhouse-client-base
-  clickhouse-client-columns
-  clickhouse-client-types
-  cpp-openssl-io
-)
-target_sources(cpp-clickhouse-client PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/block.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/client.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/query.cpp
-)
diff --git a/library/cpp/clickhouse/client/CMakeLists.linux-x86_64.txt b/library/cpp/clickhouse/client/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index f86df04097..0000000000
--- a/library/cpp/clickhouse/client/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(base)
-add_subdirectory(columns)
-add_subdirectory(types)
-
-add_library(cpp-clickhouse-client)
-target_link_libraries(cpp-clickhouse-client PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-lz4
-  contrib-restricted-cityhash-1.0.2
-  clickhouse-client-base
-  clickhouse-client-columns
-  clickhouse-client-types
-  cpp-openssl-io
-)
-target_sources(cpp-clickhouse-client PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/block.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/client.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/query.cpp
-)
diff --git a/library/cpp/clickhouse/client/CMakeLists.txt b/library/cpp/clickhouse/client/CMakeLists.txt
deleted file mode 100644
index 1beba2829f..0000000000
--- a/library/cpp/clickhouse/client/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/clickhouse/client/base/CMakeLists.darwin-arm64.txt b/library/cpp/clickhouse/client/base/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index a76303537c..0000000000
--- a/library/cpp/clickhouse/client/base/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-base)
-target_link_libraries(clickhouse-client-base PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-base PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/coded.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/compressed.cpp
-)
diff --git a/library/cpp/clickhouse/client/base/CMakeLists.darwin-x86_64.txt b/library/cpp/clickhouse/client/base/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index a76303537c..0000000000
--- a/library/cpp/clickhouse/client/base/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-base)
-target_link_libraries(clickhouse-client-base PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-base PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/coded.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/compressed.cpp
-)
diff --git a/library/cpp/clickhouse/client/base/CMakeLists.linux-aarch64.txt b/library/cpp/clickhouse/client/base/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 98015a9e92..0000000000
--- a/library/cpp/clickhouse/client/base/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-base)
-target_link_libraries(clickhouse-client-base PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-base PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/coded.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/compressed.cpp
-)
diff --git a/library/cpp/clickhouse/client/base/CMakeLists.linux-x86_64.txt b/library/cpp/clickhouse/client/base/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 98015a9e92..0000000000
--- a/library/cpp/clickhouse/client/base/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-base)
-target_link_libraries(clickhouse-client-base PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-base PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/coded.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/base/compressed.cpp
-)
diff --git a/library/cpp/clickhouse/client/base/CMakeLists.txt b/library/cpp/clickhouse/client/base/CMakeLists.txt
deleted file mode 100644
index 1beba2829f..0000000000
--- a/library/cpp/clickhouse/client/base/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/clickhouse/client/columns/CMakeLists.darwin-arm64.txt b/library/cpp/clickhouse/client/columns/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 306332e5fa..0000000000
--- a/library/cpp/clickhouse/client/columns/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-columns)
-target_link_libraries(clickhouse-client-columns PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  clickhouse-client-base
-  clickhouse-client-types
-)
-target_sources(clickhouse-client-columns PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/array.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/date.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/enum.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/factory.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/nullable.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/numeric.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/string.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/tuple.cpp
-)
diff --git a/library/cpp/clickhouse/client/columns/CMakeLists.darwin-x86_64.txt b/library/cpp/clickhouse/client/columns/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 306332e5fa..0000000000
--- a/library/cpp/clickhouse/client/columns/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-columns)
-target_link_libraries(clickhouse-client-columns PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  clickhouse-client-base
-  clickhouse-client-types
-)
-target_sources(clickhouse-client-columns PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/array.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/date.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/enum.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/factory.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/nullable.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/numeric.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/string.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/tuple.cpp
-)
diff --git a/library/cpp/clickhouse/client/columns/CMakeLists.linux-aarch64.txt b/library/cpp/clickhouse/client/columns/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 90add55098..0000000000
--- a/library/cpp/clickhouse/client/columns/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-columns)
-target_link_libraries(clickhouse-client-columns PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  clickhouse-client-base
-  clickhouse-client-types
-)
-target_sources(clickhouse-client-columns PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/array.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/date.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/enum.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/factory.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/nullable.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/numeric.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/string.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/tuple.cpp
-)
diff --git a/library/cpp/clickhouse/client/columns/CMakeLists.linux-x86_64.txt b/library/cpp/clickhouse/client/columns/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 90add55098..0000000000
--- a/library/cpp/clickhouse/client/columns/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-columns)
-target_link_libraries(clickhouse-client-columns PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  clickhouse-client-base
-  clickhouse-client-types
-)
-target_sources(clickhouse-client-columns PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/array.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/date.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/enum.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/factory.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/nullable.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/numeric.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/string.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/columns/tuple.cpp
-)
diff --git a/library/cpp/clickhouse/client/columns/CMakeLists.txt b/library/cpp/clickhouse/client/columns/CMakeLists.txt
deleted file mode 100644
index 1beba2829f..0000000000
--- a/library/cpp/clickhouse/client/columns/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/clickhouse/client/types/CMakeLists.darwin-arm64.txt b/library/cpp/clickhouse/client/types/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index abd32a8751..0000000000
--- a/library/cpp/clickhouse/client/types/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-types)
-target_link_libraries(clickhouse-client-types PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-types PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/type_parser.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/types.cpp
-)
diff --git a/library/cpp/clickhouse/client/types/CMakeLists.darwin-x86_64.txt b/library/cpp/clickhouse/client/types/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index abd32a8751..0000000000
--- a/library/cpp/clickhouse/client/types/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-types)
-target_link_libraries(clickhouse-client-types PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-types PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/type_parser.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/types.cpp
-)
diff --git a/library/cpp/clickhouse/client/types/CMakeLists.linux-aarch64.txt b/library/cpp/clickhouse/client/types/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 1957c91ece..0000000000
--- a/library/cpp/clickhouse/client/types/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-types)
-target_link_libraries(clickhouse-client-types PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-types PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/type_parser.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/types.cpp
-)
diff --git a/library/cpp/clickhouse/client/types/CMakeLists.linux-x86_64.txt b/library/cpp/clickhouse/client/types/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 1957c91ece..0000000000
--- a/library/cpp/clickhouse/client/types/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(clickhouse-client-types)
-target_link_libraries(clickhouse-client-types PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(clickhouse-client-types PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/type_parser.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/clickhouse/client/types/types.cpp
-)
diff --git a/library/cpp/clickhouse/client/types/CMakeLists.txt b/library/cpp/clickhouse/client/types/CMakeLists.txt
deleted file mode 100644
index 1beba2829f..0000000000
--- a/library/cpp/clickhouse/client/types/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/terminate_handler/CMakeLists.darwin-arm64.txt b/library/cpp/terminate_handler/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 050a5323bd..0000000000
--- a/library/cpp/terminate_handler/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/segv_handler.cpp
-)
-
-add_global_library_for(library-cpp-terminate_handler.global library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler.global PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler.global PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/terminate_handler.cpp
-)
diff --git a/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt b/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 050a5323bd..0000000000
--- a/library/cpp/terminate_handler/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/segv_handler.cpp
-)
-
-add_global_library_for(library-cpp-terminate_handler.global library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler.global PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler.global PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/terminate_handler.cpp
-)
diff --git a/library/cpp/terminate_handler/CMakeLists.linux-aarch64.txt b/library/cpp/terminate_handler/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 48d55d42ce..0000000000
--- a/library/cpp/terminate_handler/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/segv_handler.cpp
-)
-
-add_global_library_for(library-cpp-terminate_handler.global library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler.global PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler.global PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/terminate_handler.cpp
-)
diff --git a/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt b/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 48d55d42ce..0000000000
--- a/library/cpp/terminate_handler/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/segv_handler.cpp
-)
-
-add_global_library_for(library-cpp-terminate_handler.global library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler.global PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler.global PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/terminate_handler.cpp
-)
diff --git a/library/cpp/terminate_handler/CMakeLists.txt b/library/cpp/terminate_handler/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/terminate_handler/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/terminate_handler/CMakeLists.windows-x86_64.txt b/library/cpp/terminate_handler/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index 050a5323bd..0000000000
--- a/library/cpp/terminate_handler/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/segv_handler.cpp
-)
-
-add_global_library_for(library-cpp-terminate_handler.global library-cpp-terminate_handler)
-target_link_libraries(library-cpp-terminate_handler.global PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-)
-target_sources(library-cpp-terminate_handler.global PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/terminate_handler/terminate_handler.cpp
-)
diff --git a/library/cpp/testing/CMakeLists.txt b/library/cpp/testing/CMakeLists.txt
index 6e9e24fec8..8d3cd11d2a 100644
--- a/library/cpp/testing/CMakeLists.txt
+++ b/library/cpp/testing/CMakeLists.txt
@@ -10,10 +10,6 @@ add_subdirectory(benchmark)
 add_subdirectory(common)
 add_subdirectory(gbenchmark)
 add_subdirectory(gmock_in_unittest)
-add_subdirectory(gtest)
 add_subdirectory(gtest_extensions)
-add_subdirectory(gtest_main)
 add_subdirectory(hook)
-add_subdirectory(mock_server)
 add_subdirectory(unittest)
-add_subdirectory(unittest_main)
diff --git a/library/cpp/testing/gtest/CMakeLists.darwin-arm64.txt b/library/cpp/testing/gtest/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 41bc7e20f9..0000000000
--- a/library/cpp/testing/gtest/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest)
-target_link_libraries(cpp-testing-gtest PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  restricted-googletest-googlemock
-  restricted-googletest-googletest
-  cpp-string_utils-relaxed_escaper
-  cpp-testing-common
-  cpp-testing-gtest_extensions
-  cpp-testing-hook
-)
-target_sources(cpp-testing-gtest PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/gtest.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/main.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/matchers.cpp
-)
diff --git a/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt b/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 41bc7e20f9..0000000000
--- a/library/cpp/testing/gtest/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest)
-target_link_libraries(cpp-testing-gtest PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  restricted-googletest-googlemock
-  restricted-googletest-googletest
-  cpp-string_utils-relaxed_escaper
-  cpp-testing-common
-  cpp-testing-gtest_extensions
-  cpp-testing-hook
-)
-target_sources(cpp-testing-gtest PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/gtest.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/main.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/matchers.cpp
-)
diff --git a/library/cpp/testing/gtest/CMakeLists.linux-aarch64.txt b/library/cpp/testing/gtest/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index e172e2381a..0000000000
--- a/library/cpp/testing/gtest/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest)
-target_link_libraries(cpp-testing-gtest PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  restricted-googletest-googlemock
-  restricted-googletest-googletest
-  cpp-string_utils-relaxed_escaper
-  cpp-testing-common
-  cpp-testing-gtest_extensions
-  cpp-testing-hook
-)
-target_sources(cpp-testing-gtest PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/gtest.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/main.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/matchers.cpp
-)
diff --git a/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt b/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index e172e2381a..0000000000
--- a/library/cpp/testing/gtest/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest)
-target_link_libraries(cpp-testing-gtest PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  restricted-googletest-googlemock
-  restricted-googletest-googletest
-  cpp-string_utils-relaxed_escaper
-  cpp-testing-common
-  cpp-testing-gtest_extensions
-  cpp-testing-hook
-)
-target_sources(cpp-testing-gtest PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/gtest.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/main.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/matchers.cpp
-)
diff --git a/library/cpp/testing/gtest/CMakeLists.txt b/library/cpp/testing/gtest/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/testing/gtest/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/testing/gtest/CMakeLists.windows-x86_64.txt b/library/cpp/testing/gtest/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index 41bc7e20f9..0000000000
--- a/library/cpp/testing/gtest/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest)
-target_link_libraries(cpp-testing-gtest PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  restricted-googletest-googlemock
-  restricted-googletest-googletest
-  cpp-string_utils-relaxed_escaper
-  cpp-testing-common
-  cpp-testing-gtest_extensions
-  cpp-testing-hook
-)
-target_sources(cpp-testing-gtest PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/gtest.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/main.cpp
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest/matchers.cpp
-)
diff --git a/library/cpp/testing/gtest_main/CMakeLists.darwin-arm64.txt b/library/cpp/testing/gtest_main/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 1075010e22..0000000000
--- a/library/cpp/testing/gtest_main/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest_main)
-target_link_libraries(cpp-testing-gtest_main PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-gtest
-)
-target_sources(cpp-testing-gtest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest_main/main.cpp
-)
diff --git a/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt b/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 1075010e22..0000000000
--- a/library/cpp/testing/gtest_main/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest_main)
-target_link_libraries(cpp-testing-gtest_main PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-gtest
-)
-target_sources(cpp-testing-gtest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest_main/main.cpp
-)
diff --git a/library/cpp/testing/gtest_main/CMakeLists.linux-aarch64.txt b/library/cpp/testing/gtest_main/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index f3ef692fb6..0000000000
--- a/library/cpp/testing/gtest_main/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest_main)
-target_link_libraries(cpp-testing-gtest_main PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-gtest
-)
-target_sources(cpp-testing-gtest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest_main/main.cpp
-)
diff --git a/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt b/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index f3ef692fb6..0000000000
--- a/library/cpp/testing/gtest_main/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest_main)
-target_link_libraries(cpp-testing-gtest_main PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-gtest
-)
-target_sources(cpp-testing-gtest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest_main/main.cpp
-)
diff --git a/library/cpp/testing/gtest_main/CMakeLists.txt b/library/cpp/testing/gtest_main/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/testing/gtest_main/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/testing/gtest_main/CMakeLists.windows-x86_64.txt b/library/cpp/testing/gtest_main/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index 1075010e22..0000000000
--- a/library/cpp/testing/gtest_main/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-gtest_main)
-target_link_libraries(cpp-testing-gtest_main PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-gtest
-)
-target_sources(cpp-testing-gtest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/gtest_main/main.cpp
-)
diff --git a/library/cpp/testing/mock_server/CMakeLists.darwin-arm64.txt b/library/cpp/testing/mock_server/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index a5d1538c15..0000000000
--- a/library/cpp/testing/mock_server/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-mock_server)
-target_link_libraries(cpp-testing-mock_server PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-http-misc
-  cpp-http-server
-)
-target_sources(cpp-testing-mock_server PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/mock_server/server.cpp
-)
diff --git a/library/cpp/testing/mock_server/CMakeLists.darwin-x86_64.txt b/library/cpp/testing/mock_server/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index a5d1538c15..0000000000
--- a/library/cpp/testing/mock_server/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-mock_server)
-target_link_libraries(cpp-testing-mock_server PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-http-misc
-  cpp-http-server
-)
-target_sources(cpp-testing-mock_server PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/mock_server/server.cpp
-)
diff --git a/library/cpp/testing/mock_server/CMakeLists.linux-aarch64.txt b/library/cpp/testing/mock_server/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index c630a22d23..0000000000
--- a/library/cpp/testing/mock_server/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-mock_server)
-target_link_libraries(cpp-testing-mock_server PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-http-misc
-  cpp-http-server
-)
-target_sources(cpp-testing-mock_server PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/mock_server/server.cpp
-)
diff --git a/library/cpp/testing/mock_server/CMakeLists.linux-x86_64.txt b/library/cpp/testing/mock_server/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index c630a22d23..0000000000
--- a/library/cpp/testing/mock_server/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-mock_server)
-target_link_libraries(cpp-testing-mock_server PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-http-misc
-  cpp-http-server
-)
-target_sources(cpp-testing-mock_server PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/mock_server/server.cpp
-)
diff --git a/library/cpp/testing/mock_server/CMakeLists.txt b/library/cpp/testing/mock_server/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/testing/mock_server/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/testing/mock_server/CMakeLists.windows-x86_64.txt b/library/cpp/testing/mock_server/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index a5d1538c15..0000000000
--- a/library/cpp/testing/mock_server/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-mock_server)
-target_link_libraries(cpp-testing-mock_server PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-http-misc
-  cpp-http-server
-)
-target_sources(cpp-testing-mock_server PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/mock_server/server.cpp
-)
diff --git a/library/cpp/testing/unittest_main/CMakeLists.darwin-arm64.txt b/library/cpp/testing/unittest_main/CMakeLists.darwin-arm64.txt
deleted file mode 100644
index 47d1aa79f6..0000000000
--- a/library/cpp/testing/unittest_main/CMakeLists.darwin-arm64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-unittest_main)
-target_link_libraries(cpp-testing-unittest_main PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest
-  library-cpp-terminate_handler
-)
-target_sources(cpp-testing-unittest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp
-)
diff --git a/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt b/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 47d1aa79f6..0000000000
--- a/library/cpp/testing/unittest_main/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-unittest_main)
-target_link_libraries(cpp-testing-unittest_main PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest
-  library-cpp-terminate_handler
-)
-target_sources(cpp-testing-unittest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp
-)
diff --git a/library/cpp/testing/unittest_main/CMakeLists.linux-aarch64.txt b/library/cpp/testing/unittest_main/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 38c9a6036d..0000000000
--- a/library/cpp/testing/unittest_main/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-unittest_main)
-target_link_libraries(cpp-testing-unittest_main PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest
-  library-cpp-terminate_handler
-)
-target_sources(cpp-testing-unittest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp
-)
diff --git a/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt b/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 38c9a6036d..0000000000
--- a/library/cpp/testing/unittest_main/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-unittest_main)
-target_link_libraries(cpp-testing-unittest_main PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest
-  library-cpp-terminate_handler
-)
-target_sources(cpp-testing-unittest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp
-)
diff --git a/library/cpp/testing/unittest_main/CMakeLists.txt b/library/cpp/testing/unittest_main/CMakeLists.txt
deleted file mode 100644
index 2dce3a77fe..0000000000
--- a/library/cpp/testing/unittest_main/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
-  include(CMakeLists.darwin-arm64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
diff --git a/library/cpp/testing/unittest_main/CMakeLists.windows-x86_64.txt b/library/cpp/testing/unittest_main/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index 47d1aa79f6..0000000000
--- a/library/cpp/testing/unittest_main/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(cpp-testing-unittest_main)
-target_link_libraries(cpp-testing-unittest_main PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-testing-unittest
-  library-cpp-terminate_handler
-)
-target_sources(cpp-testing-unittest_main PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/testing/unittest_main/main.cpp
-)