diff --git a/programs/disks/CommandChangeDirectory.cpp b/programs/disks/CommandChangeDirectory.cpp
index 9932d918099..3baf69f8be0 100644
--- a/programs/disks/CommandChangeDirectory.cpp
+++ b/programs/disks/CommandChangeDirectory.cpp
@@ -8,11 +8,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandChangeDirectory final : public ICommand
 {
 public:
@@ -28,9 +23,7 @@ public:
     void executeImpl(const CommandLineOptions & options, DisksClient & client) override
     {
         DiskWithPath & disk = getDiskWithPath(client, options, "disk");
-        // std::cerr << "Disk name: " << disk.getDisk()->getName() << std::endl;
         String path = getValueFromCommandLineOptionsThrow<String>(options, "path");
-        // std::cerr << "Disk path: " << path << std::endl;
         disk.setPath(path);
     }
 };
diff --git a/programs/disks/CommandCopy.cpp b/programs/disks/CommandCopy.cpp
index e853e054f97..ae749f7448a 100644
--- a/programs/disks/CommandCopy.cpp
+++ b/programs/disks/CommandCopy.cpp
@@ -6,11 +6,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandCopy final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandLink.cpp b/programs/disks/CommandLink.cpp
index 8b467891d18..7e80faf9fc6 100644
--- a/programs/disks/CommandLink.cpp
+++ b/programs/disks/CommandLink.cpp
@@ -4,11 +4,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandLink final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandList.cpp b/programs/disks/CommandList.cpp
index 16d249e299d..f91f0c6455c 100644
--- a/programs/disks/CommandList.cpp
+++ b/programs/disks/CommandList.cpp
@@ -7,11 +7,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandList final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandListDisks.cpp b/programs/disks/CommandListDisks.cpp
index 16779b0fdae..9fb67fed5e0 100644
--- a/programs/disks/CommandListDisks.cpp
+++ b/programs/disks/CommandListDisks.cpp
@@ -7,11 +7,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandListDisks final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandMkDir.cpp b/programs/disks/CommandMkDir.cpp
index 23312435d4e..895602adf72 100644
--- a/programs/disks/CommandMkDir.cpp
+++ b/programs/disks/CommandMkDir.cpp
@@ -6,11 +6,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandMkDir final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandMove.cpp b/programs/disks/CommandMove.cpp
index 25620de448e..fb2fce2fa61 100644
--- a/programs/disks/CommandMove.cpp
+++ b/programs/disks/CommandMove.cpp
@@ -4,11 +4,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandMove final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandRead.cpp b/programs/disks/CommandRead.cpp
index 82ff90b6e02..6963824b5cc 100644
--- a/programs/disks/CommandRead.cpp
+++ b/programs/disks/CommandRead.cpp
@@ -8,18 +8,12 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandRead final : public ICommand
 {
 public:
     CommandRead()
     {
         command_name = "read";
-        // command_option_description.emplace(createOptionsDescription("Allowed options", getTerminalWidth()));
         description = "Read a file from `FROM_PATH` to `TO_PATH`";
         options_description.add_options()(
             "path-from", po::value<String>(), "file from which we are reading, defaults to `stdin` (mandatory, positional)")(
diff --git a/programs/disks/CommandRemove.cpp b/programs/disks/CommandRemove.cpp
index 0344a09d156..f332267c780 100644
--- a/programs/disks/CommandRemove.cpp
+++ b/programs/disks/CommandRemove.cpp
@@ -4,11 +4,6 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandRemove final : public ICommand
 {
 public:
diff --git a/programs/disks/CommandSwitchDisk.cpp b/programs/disks/CommandSwitchDisk.cpp
index 6c1fbaa0623..e59a1fc8e87 100644
--- a/programs/disks/CommandSwitchDisk.cpp
+++ b/programs/disks/CommandSwitchDisk.cpp
@@ -8,20 +8,13 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandSwitchDisk final : public ICommand
 {
 public:
     explicit CommandSwitchDisk() : ICommand()
     {
         command_name = "switch-disk";
-        // options_description.emplace(createOptionsDescription("Allowed options", getTerminalWidth()));
         description = "Change disk";
-        // options_description->add_options()("recursive", "recursively list all directories");
         options_description.add_options()("disk", po::value<String>(), "the disk to switch to (mandatory, positional)")(
             "path", po::value<String>(), "the path to switch on the disk");
         positional_options_description.add("disk", 1);
diff --git a/programs/disks/CommandWrite.cpp b/programs/disks/CommandWrite.cpp
index 42999572443..e8b3a0741ba 100644
--- a/programs/disks/CommandWrite.cpp
+++ b/programs/disks/CommandWrite.cpp
@@ -9,18 +9,12 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-extern const int BAD_ARGUMENTS;
-}
-
 class CommandWrite final : public ICommand
 {
 public:
     CommandWrite()
     {
         command_name = "write";
-        // command_option_description.emplace(createOptionsDescription("Allowed options", getTerminalWidth()));
         description = "Write a file from `FROM_PATH` to `TO_PATH`";
         options_description.add_options()("path-from", po::value<String>(), "file from which we are reading, defaults to `stdin`")(
             "path-to", po::value<String>(), "file to which we are writing (mandatory, positional)");
diff --git a/programs/disks/DisksApp.cpp b/programs/disks/DisksApp.cpp
index 02e8b74b889..10eb3f986b9 100644
--- a/programs/disks/DisksApp.cpp
+++ b/programs/disks/DisksApp.cpp
@@ -257,7 +257,7 @@ void DisksApp::addOptions()
     command_descriptions.emplace("mkdir", makeCommandMkDir());
     command_descriptions.emplace("switch-disk", makeCommandSwitchDisk());
 #ifdef CLICKHOUSE_CLOUD
-    // command_descriptions.emplace("packed-io", makeCommandPackedIO());
+    command_descriptions.emplace("packed-io", makeCommandPackedIO());
 #endif
 }
 
diff --git a/programs/disks/DisksApp.h b/programs/disks/DisksApp.h
index a0ce98b51d0..7c9150cd1ce 100644
--- a/programs/disks/DisksApp.h
+++ b/programs/disks/DisksApp.h
@@ -15,6 +15,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int BAD_ARGUMENTS;
+extern const int LOGICAL_ERROR;
+};
+
 using ProgramOptionsDescription = boost::program_options::options_description;
 using CommandLineOptions = boost::program_options::variables_map;
 
diff --git a/programs/disks/DisksClient.h b/programs/disks/DisksClient.h
index e3b8cf7c8a9..89d5ecce666 100644
--- a/programs/disks/DisksClient.h
+++ b/programs/disks/DisksClient.h
@@ -24,7 +24,6 @@ namespace fs = std::filesystem;
 namespace DB
 {
 
-
 std::vector<String> split(const String & text, const String & delimiters);
 
 using ProgramOptionsDescription = boost::program_options::options_description;
@@ -34,6 +33,7 @@ using CommandLineOptions = boost::program_options::variables_map;
 namespace ErrorCodes
 {
 extern const int BAD_ARGUMENTS;
+extern const int LOGICAL_ERROR;
 };
 
 class DiskWithPath