diff --git a/ydb/core/actorlib_impl/mad_squirrel.cpp b/ydb/core/actorlib_impl/mad_squirrel.cpp
deleted file mode 100644
index b24813ce227f..000000000000
--- a/ydb/core/actorlib_impl/mad_squirrel.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "mad_squirrel.h"
-#include <ydb/library/actors/core/events.h>
-#include <ydb/library/actors/core/hfunc.h>
-
-namespace NActors {
-
-class TMadSquirrel : public TActor<TMadSquirrel> {
-    TAutoPtr<IEventHandle> AfterRegister(const TActorId &self, const TActorId &) override {
-        return new IEventHandle(self, self, new TEvents::TEvWakeup());
-    }
-
-public:
-    static constexpr auto ActorActivityType() {
-        return IActor::EActivityType::ACTORLIB_COMMON;
-    }
-
-    TMadSquirrel()
-        : TActor(&TThis::StateFunc)
-    {}
-
-    STFUNC(StateFunc) {
-        Y_UNUSED(ev);
-        Send(SelfId(), new TEvents::TEvWakeup());
-    }
-};
-
-IActor* CreateMadSquirrel() {
-    return new TMadSquirrel();
-}
-
-}
diff --git a/ydb/core/actorlib_impl/ya.make b/ydb/core/actorlib_impl/ya.make
index 76aec96a5495..72df4bd13ab1 100644
--- a/ydb/core/actorlib_impl/ya.make
+++ b/ydb/core/actorlib_impl/ya.make
@@ -13,9 +13,6 @@ SRCS(
     load_network.h
     long_timer.cpp
     long_timer.h
-    mad_squirrel.cpp
-    mad_squirrel.h
-    melancholic_gopher.cpp
     name_service_client_protocol.cpp
     name_service_client_protocol.h
     proto_ready_actor.h
diff --git a/ydb/core/driver_lib/cli_utils/cli_actorsystem_perftest.cpp b/ydb/core/driver_lib/cli_utils/cli_actorsystem_perftest.cpp
index 7f463b515382..14eb8d3c2a95 100644
--- a/ydb/core/driver_lib/cli_utils/cli_actorsystem_perftest.cpp
+++ b/ydb/core/driver_lib/cli_utils/cli_actorsystem_perftest.cpp
@@ -1,5 +1,5 @@
 #include "cli.h"
-#include <ydb/core/actorlib_impl/mad_squirrel.h>
+#include "melancholic_gopher.h"
 #include <ydb/library/actors/core/actorsystem.h>
 #include <ydb/library/actors/core/scheduler_basic.h>
 #include <ydb/library/actors/core/executor_pool_basic.h>
diff --git a/ydb/core/actorlib_impl/melancholic_gopher.cpp b/ydb/core/driver_lib/cli_utils/melancholic_gopher.cpp
similarity index 99%
rename from ydb/core/actorlib_impl/melancholic_gopher.cpp
rename to ydb/core/driver_lib/cli_utils/melancholic_gopher.cpp
index aea76dc38a3f..e2ac6d98353b 100644
--- a/ydb/core/actorlib_impl/melancholic_gopher.cpp
+++ b/ydb/core/driver_lib/cli_utils/melancholic_gopher.cpp
@@ -1,4 +1,4 @@
-#include "mad_squirrel.h"
+#include "melancholic_gopher.h"
 #include <ydb/library/actors/core/events.h>
 #include <ydb/library/actors/core/log.h>
 #include <ydb/library/actors/core/hfunc.h>
diff --git a/ydb/core/actorlib_impl/mad_squirrel.h b/ydb/core/driver_lib/cli_utils/melancholic_gopher.h
similarity index 85%
rename from ydb/core/actorlib_impl/mad_squirrel.h
rename to ydb/core/driver_lib/cli_utils/melancholic_gopher.h
index d0494e7d7bcd..819a065243d9 100644
--- a/ydb/core/actorlib_impl/mad_squirrel.h
+++ b/ydb/core/driver_lib/cli_utils/melancholic_gopher.h
@@ -3,7 +3,6 @@
 
 namespace NActors {
 
-IActor* CreateMadSquirrel(); // will send messages to itself in round
 IActor* CreateMelancholicGopher(double surveyForSeconds, const TActorId &reportTo); // will spin for survey period and then wakeup next in line
 IActor* CreateGopherMother(const TVector<std::pair<ui32, double>> &lineProfile, ui32 lines, ui32 shotsInRound); // would spawn gophers according to profile (poolid, period) in lines number
 
diff --git a/ydb/core/driver_lib/cli_utils/ya.make b/ydb/core/driver_lib/cli_utils/ya.make
index b12182b8139e..797d65d84e32 100644
--- a/ydb/core/driver_lib/cli_utils/ya.make
+++ b/ydb/core/driver_lib/cli_utils/ya.make
@@ -29,6 +29,8 @@ SRCS(
     cli_minikql_compile_and_exec.cpp
     cli_scheme_cache_append.cpp
     cli_scheme_initroot.cpp
+    melancholic_gopher.cpp
+    melancholic_gopher.h
 )
 
 PEERDIR(
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index e69ba68f1669..c8ee46837be7 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -5,7 +5,6 @@
 
 #include <ydb/core/actorlib_impl/destruct_actor.h>
 #include <ydb/core/actorlib_impl/load_network.h>
-#include <ydb/core/actorlib_impl/mad_squirrel.h>
 
 #include "ydb/core/audit/audit_log.h"
 
@@ -578,15 +577,6 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
     setup->CpuManager = CreateCpuManagerConfig(systemConfig, appData);
     setup->MonitorStuckActors = systemConfig.GetMonitorStuckActors();
 
-    for (ui32 poolId = 0; poolId != setup->GetExecutorsCount(); ++poolId) {
-        const auto &execConfig = systemConfig.GetExecutor(poolId);
-        if (execConfig.HasInjectMadSquirrels()) {
-            for (ui32 i = execConfig.GetInjectMadSquirrels(); i > 0; --i) {
-                setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(TActorId(), TActorSetupCmd(CreateMadSquirrel(), TMailboxType::HTSwap, poolId)));
-            }
-        }
-    }
-
     auto schedulerConfig = CreateSchedulerConfig(systemConfig.GetScheduler());
     schedulerConfig.MonCounters = GetServiceCounters(counters, "utils");
     setup->Scheduler.Reset(CreateSchedulerThread(schedulerConfig));
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 5996acf0166d..ee71d994cc46 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -23,7 +23,6 @@
 #include <ydb/library/actors/interconnect/interconnect_tcp_proxy.h>
 #include <ydb/library/actors/interconnect/interconnect_tcp_server.h>
 #include <ydb/library/actors/interconnect/interconnect_mon.h>
-#include <ydb/core/actorlib_impl/mad_squirrel.h>
 #include <ydb/core/config/init/dummy.h>
 
 #include <ydb/core/control/immediate_control_board_actor.h>
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
index 6ef8242f76aa..816dcabd228a 100644
--- a/ydb/core/protos/config.proto
+++ b/ydb/core/protos/config.proto
@@ -69,7 +69,7 @@ message TActorSystemConfig {
         optional uint32 Threads = 2;
         optional uint64 SpinThreshold = 3;
         optional TAffinity Affinity = 4;
-        optional uint32 InjectMadSquirrels = 5;
+        optional uint32 InjectMadSquirrels = 5; // Obsolete, no more mad squirrels anymore
         optional string Name = 6;
         optional uint32 TimePerMailboxMicroSecs = 7;
         optional uint32 EventsPerMailbox = 8;