diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp
index abd776c..70132b0 100644
--- a/telegram-bot-api/Client.cpp
+++ b/telegram-bot-api/Client.cpp
@@ -4856,30 +4856,13 @@ void Client::on_closed() {
   if (logging_out_) {
     parameters_->shared_data_->webhook_db_->erase(bot_token_with_dc_);
 
-    class RmWorker final : public td::Actor {
-     public:
-      RmWorker(td::string dir, td::ActorId<Client> parent) : dir_(std::move(dir)), parent_(std::move(parent)) {
-      }
-
-     private:
-      td::string dir_;
-      td::ActorId<Client> parent_;
-
-      void start_up() final {
-        CHECK(dir_.size() >= 24);
-        CHECK(dir_.back() == TD_DIR_SLASH);
-        td::rmrf(dir_).ignore();
-        stop();
-      }
-      void tear_down() final {
-        send_closure(parent_, &Client::finish_closing);
-      }
-    };
-    // NB: the same scheduler as for database in Td
-    auto current_scheduler_id = td::Scheduler::instance()->sched_id();
-    auto scheduler_count = td::Scheduler::instance()->sched_count();
-    auto scheduler_id = td::min(current_scheduler_id + 1, scheduler_count - 1);
-    td::create_actor_on_scheduler<RmWorker>("RmWorker", scheduler_id, dir_, actor_id(this)).release();
+    td::Scheduler::instance()->run_on_scheduler(get_database_scheduler_id(),
+                                                [actor_id = actor_id(this), dir = dir_](td::Unit) {
+                                                  CHECK(dir.size() >= 24);
+                                                  CHECK(dir.back() == TD_DIR_SLASH);
+                                                  td::rmrf(dir).ignore();
+                                                  send_closure(actor_id, &Client::finish_closing);
+                                                });
     return;
   }
 
@@ -4899,6 +4882,13 @@ void Client::timeout_expired() {
   stop();
 }
 
+td::int32 Client::get_database_scheduler_id() {
+  // NB: the same scheduler as for database in Td
+  auto current_scheduler_id = td::Scheduler::instance()->sched_id();
+  auto scheduler_count = td::Scheduler::instance()->sched_count();
+  return td::min(current_scheduler_id + 1, scheduler_count - 1);
+}
+
 void Client::clear_tqueue() {
   CHECK(webhook_id_.empty());
   auto &tqueue = parameters_->shared_data_->tqueue_;
diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h
index 2a47017..3bf7265 100644
--- a/telegram-bot-api/Client.h
+++ b/telegram-bot-api/Client.h
@@ -302,6 +302,8 @@ class Client final : public WebhookActor::Callback {
   void on_closed();
   void finish_closing();
 
+  static int32 get_database_scheduler_id();
+
   void clear_tqueue();
 
   bool allow_update_before_authorization(const td_api::Object *update) const;