diff --git a/ydb/public/lib/ydb_cli/common/command.cpp b/ydb/public/lib/ydb_cli/common/command.cpp
index 9264850d66ef..c91cb24c3506 100644
--- a/ydb/public/lib/ydb_cli/common/command.cpp
+++ b/ydb/public/lib/ydb_cli/common/command.cpp
@@ -204,7 +204,7 @@ int TClientCommand::Process(TConfig& config) {
 }
 
 void TClientCommand::SaveParseResult(TConfig& config) {
-    ParseResult = std::make_shared<TCommandOptsParseResult>(config.Opts, config.ArgC, config.ArgV);
+    ParseResult = std::make_shared<NLastGetopt::TOptsParseResult>(config.Opts, config.ArgC, config.ArgV);
 }
 
 void TClientCommand::Prepare(TConfig& config) {
diff --git a/ydb/public/lib/ydb_cli/common/command.h b/ydb/public/lib/ydb_cli/common/command.h
index 27ec26864324..d3ea848edfb6 100644
--- a/ydb/public/lib/ydb_cli/common/command.h
+++ b/ydb/public/lib/ydb_cli/common/command.h
@@ -326,36 +326,7 @@ class TClientCommand {
         }
     };
 
-    class TCommandOptsParseResult: public NLastGetopt::TOptsParseResult {
-    public:
-        TCommandOptsParseResult(const NLastGetopt::TOpts* options, int argc, const char* argv[]) {
-            Init(options, argc, argv);
-        }
-        TCommandOptsParseResult(const NLastGetopt::TOpts* options, int argc, char* argv[]) {
-            Init(options, argc, const_cast<const char**>(argv));
-        }
-        virtual ~TCommandOptsParseResult() = default;
-
-        void HandleError() const override {
-            if (ThrowOnParseError) {
-                throw;
-            }
-            NLastGetopt::TOptsParseResult::HandleError();
-        }
-
-    protected:
-        TCommandOptsParseResult() = default;
-
-        void Init(const NLastGetopt::TOpts* options, int argc, const char* argv[]) {
-            ThrowOnParseError = options->HasLongOption("throw-on-parse-error");
-            NLastGetopt::TOptsParseResult::Init(options, argc, argv);
-        }
-
-    private:
-        bool ThrowOnParseError = false;
-    };
-
-    class TOptsParseOneLevelResult : public TCommandOptsParseResult {
+    class TOptsParseOneLevelResult : public NLastGetopt::TOptsParseResult {
     public:
         TOptsParseOneLevelResult(TConfig& config);
     };