diff --git a/client/build_cancel.go b/client/build_cancel.go
index 51a73cdb25..a5eeb81722 100644
--- a/client/build_cancel.go
+++ b/client/build_cancel.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/build_prune.go b/client/build_prune.go
index db8fad55d3..6f0f59e30d 100644
--- a/client/build_prune.go
+++ b/client/build_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/checkpoint.go b/client/checkpoint.go
index f690f7c952..d020574c89 100644
--- a/client/checkpoint.go
+++ b/client/checkpoint.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/checkpoint_create.go b/client/checkpoint_create.go
index 7b06fee31d..961a5fe62f 100644
--- a/client/checkpoint_create.go
+++ b/client/checkpoint_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/checkpoint_create_test.go b/client/checkpoint_create_test.go
index bde23f53d7..ad912822a0 100644
--- a/client/checkpoint_create_test.go
+++ b/client/checkpoint_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/checkpoint_delete.go b/client/checkpoint_delete.go
index d15162ea04..4c51b25f24 100644
--- a/client/checkpoint_delete.go
+++ b/client/checkpoint_delete.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/checkpoint_delete_test.go b/client/checkpoint_delete_test.go
index eeb305085e..1faa483bf9 100644
--- a/client/checkpoint_delete_test.go
+++ b/client/checkpoint_delete_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/checkpoint_list.go b/client/checkpoint_list.go
index 9e7963f0bb..8164c7668b 100644
--- a/client/checkpoint_list.go
+++ b/client/checkpoint_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/checkpoint_list_test.go b/client/checkpoint_list_test.go
index 6ca1b7581e..4103780bb5 100644
--- a/client/checkpoint_list_test.go
+++ b/client/checkpoint_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/client.go b/client/client.go
index cd47f05eb2..d6e014dddf 100644
--- a/client/client.go
+++ b/client/client.go
@@ -39,7 +39,7 @@ For example, to list running containers (the equivalent of "docker ps"):
 		}
 	}
 */
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/client_interfaces.go b/client/client_interfaces.go
index fe4b1af9b0..df7aad430c 100644
--- a/client/client_interfaces.go
+++ b/client/client_interfaces.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/client_mock_test.go b/client/client_mock_test.go
index 4c9989f25f..2da540f2fc 100644
--- a/client/client_mock_test.go
+++ b/client/client_mock_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/client_test.go b/client/client_test.go
index f700887e7c..a0d25c357c 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/client_unix.go b/client/client_unix.go
index 9fe78ea43a..e5b921b406 100644
--- a/client/client_unix.go
+++ b/client/client_unix.go
@@ -1,6 +1,6 @@
 //go:build !windows
 
-package client // import "github.com/docker/docker/client"
+package client
 
 // DefaultDockerHost defines OS-specific default host if the DOCKER_HOST
 // (EnvOverrideHost) environment variable is unset or empty.
diff --git a/client/client_windows.go b/client/client_windows.go
index 56572d1a27..19b954b2fd 100644
--- a/client/client_windows.go
+++ b/client/client_windows.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 // DefaultDockerHost defines OS-specific default host if the DOCKER_HOST
 // (EnvOverrideHost) environment variable is unset or empty.
diff --git a/client/config_create.go b/client/config_create.go
index 1fbfc21f92..a39168e23b 100644
--- a/client/config_create.go
+++ b/client/config_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/config_create_test.go b/client/config_create_test.go
index 3e80ad530f..25ff789150 100644
--- a/client/config_create_test.go
+++ b/client/config_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/config_inspect.go b/client/config_inspect.go
index 679a42c762..a9f0a8b05e 100644
--- a/client/config_inspect.go
+++ b/client/config_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/config_inspect_test.go b/client/config_inspect_test.go
index 1633e38676..94f2f97386 100644
--- a/client/config_inspect_test.go
+++ b/client/config_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/config_list.go b/client/config_list.go
index 67779e98aa..6f8a1c21f0 100644
--- a/client/config_list.go
+++ b/client/config_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/config_list_test.go b/client/config_list_test.go
index 28616643da..2ae5b809aa 100644
--- a/client/config_list_test.go
+++ b/client/config_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/config_remove.go b/client/config_remove.go
index a2955c6894..99d33b1ce2 100644
--- a/client/config_remove.go
+++ b/client/config_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import "context"
 
diff --git a/client/config_remove_test.go b/client/config_remove_test.go
index 63e28526bc..7377a6512a 100644
--- a/client/config_remove_test.go
+++ b/client/config_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/config_update.go b/client/config_update.go
index ddb219cf6a..9bc137f7f9 100644
--- a/client/config_update.go
+++ b/client/config_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/config_update_test.go b/client/config_update_test.go
index f0b87bf5a9..e846781b1b 100644
--- a/client/config_update_test.go
+++ b/client/config_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_attach.go b/client/container_attach.go
index 2e7a13e5c5..1fb3493ebf 100644
--- a/client/container_attach.go
+++ b/client/container_attach.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_commit.go b/client/container_commit.go
index 4838ac71de..2b5b9852fb 100644
--- a/client/container_commit.go
+++ b/client/container_commit.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_commit_test.go b/client/container_commit_test.go
index 40d35e962b..6b5f781f53 100644
--- a/client/container_commit_test.go
+++ b/client/container_commit_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_copy.go b/client/container_copy.go
index 39584d375f..7c4130dc7f 100644
--- a/client/container_copy.go
+++ b/client/container_copy.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_copy_test.go b/client/container_copy_test.go
index c5fc5d3643..35a91dcd95 100644
--- a/client/container_copy_test.go
+++ b/client/container_copy_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_create.go b/client/container_create.go
index 9bb106f776..0625cb125c 100644
--- a/client/container_create.go
+++ b/client/container_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_create_test.go b/client/container_create_test.go
index f86cf5f2a3..195d354cbe 100644
--- a/client/container_create_test.go
+++ b/client/container_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_diff.go b/client/container_diff.go
index 52401898bd..3848e3117e 100644
--- a/client/container_diff.go
+++ b/client/container_diff.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_diff_test.go b/client/container_diff_test.go
index 2bed799d93..28ddd85339 100644
--- a/client/container_diff_test.go
+++ b/client/container_diff_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_exec.go b/client/container_exec.go
index a39ec71790..8abbf8924b 100644
--- a/client/container_exec.go
+++ b/client/container_exec.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_exec_test.go b/client/container_exec_test.go
index 2e19a65a4a..ca3327c4cf 100644
--- a/client/container_exec_test.go
+++ b/client/container_exec_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_export.go b/client/container_export.go
index 360d527630..3fc4d5704d 100644
--- a/client/container_export.go
+++ b/client/container_export.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_export_test.go b/client/container_export_test.go
index 8fa725008f..acff25b649 100644
--- a/client/container_export_test.go
+++ b/client/container_export_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_inspect.go b/client/container_inspect.go
index 6000318607..18ccdf2339 100644
--- a/client/container_inspect.go
+++ b/client/container_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_inspect_test.go b/client/container_inspect_test.go
index a84a1f2866..de1b2a1621 100644
--- a/client/container_inspect_test.go
+++ b/client/container_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_kill.go b/client/container_kill.go
index 22767ae682..251ae479a3 100644
--- a/client/container_kill.go
+++ b/client/container_kill.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_kill_test.go b/client/container_kill_test.go
index 6e84007ecc..646e555aa4 100644
--- a/client/container_kill_test.go
+++ b/client/container_kill_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_list.go b/client/container_list.go
index 510bcdf680..e17b14acff 100644
--- a/client/container_list.go
+++ b/client/container_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_list_test.go b/client/container_list_test.go
index fb7570c5f2..ae461e7b4b 100644
--- a/client/container_list_test.go
+++ b/client/container_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_logs.go b/client/container_logs.go
index ae30f8d10d..3ea1f68d42 100644
--- a/client/container_logs.go
+++ b/client/container_logs.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_logs_test.go b/client/container_logs_test.go
index 8331060e99..1b0fb7252a 100644
--- a/client/container_logs_test.go
+++ b/client/container_logs_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_pause.go b/client/container_pause.go
index 5cc2984013..59b3e2d865 100644
--- a/client/container_pause.go
+++ b/client/container_pause.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import "context"
 
diff --git a/client/container_pause_test.go b/client/container_pause_test.go
index d7aa852658..91a13cb8b5 100644
--- a/client/container_pause_test.go
+++ b/client/container_pause_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_prune.go b/client/container_prune.go
index 3176be5969..84fb6bc235 100644
--- a/client/container_prune.go
+++ b/client/container_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_prune_test.go b/client/container_prune_test.go
index c90cd3753c..b4541ea219 100644
--- a/client/container_prune_test.go
+++ b/client/container_prune_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_remove.go b/client/container_remove.go
index 6661351a92..b1a2ce6b83 100644
--- a/client/container_remove.go
+++ b/client/container_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_remove_test.go b/client/container_remove_test.go
index 0247c0649a..6aec805046 100644
--- a/client/container_remove_test.go
+++ b/client/container_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_rename.go b/client/container_rename.go
index 0a092310c6..4c030228cd 100644
--- a/client/container_rename.go
+++ b/client/container_rename.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_rename_test.go b/client/container_rename_test.go
index 4782c502c1..70354e094a 100644
--- a/client/container_rename_test.go
+++ b/client/container_rename_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_resize.go b/client/container_resize.go
index 725c08ad41..56b7368b75 100644
--- a/client/container_resize.go
+++ b/client/container_resize.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_resize_test.go b/client/container_resize_test.go
index 0d29a32583..518876fc74 100644
--- a/client/container_resize_test.go
+++ b/client/container_resize_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_restart.go b/client/container_restart.go
index 50559ba6e4..5af07bfc76 100644
--- a/client/container_restart.go
+++ b/client/container_restart.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_restart_test.go b/client/container_restart_test.go
index db393b1d93..cb850cf26d 100644
--- a/client/container_restart_test.go
+++ b/client/container_restart_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_start.go b/client/container_start.go
index b81ed3ebc8..ff2f82694b 100644
--- a/client/container_start.go
+++ b/client/container_start.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_start_test.go b/client/container_start_test.go
index e4365997f6..d75c52294d 100644
--- a/client/container_start_test.go
+++ b/client/container_start_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_stats.go b/client/container_stats.go
index a66b90cb28..2244e0f4b9 100644
--- a/client/container_stats.go
+++ b/client/container_stats.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_stats_test.go b/client/container_stats_test.go
index 012e4e21db..9755eae0c4 100644
--- a/client/container_stats_test.go
+++ b/client/container_stats_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_stop.go b/client/container_stop.go
index eb0129ce37..175b9c8bcc 100644
--- a/client/container_stop.go
+++ b/client/container_stop.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_stop_test.go b/client/container_stop_test.go
index 4c5ead6bba..b22c671149 100644
--- a/client/container_stop_test.go
+++ b/client/container_stop_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_top.go b/client/container_top.go
index 12c8b78f6c..5770f9d469 100644
--- a/client/container_top.go
+++ b/client/container_top.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_top_test.go b/client/container_top_test.go
index bbec3fb812..3819a59158 100644
--- a/client/container_top_test.go
+++ b/client/container_top_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_unpause.go b/client/container_unpause.go
index f602549bb2..c95f6e3aba 100644
--- a/client/container_unpause.go
+++ b/client/container_unpause.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import "context"
 
diff --git a/client/container_unpause_test.go b/client/container_unpause_test.go
index ad053475f5..af4992db3b 100644
--- a/client/container_unpause_test.go
+++ b/client/container_unpause_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_update.go b/client/container_update.go
index 7f0cf62760..10e966d089 100644
--- a/client/container_update.go
+++ b/client/container_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/container_update_test.go b/client/container_update_test.go
index 96693c89e4..5ea156b768 100644
--- a/client/container_update_test.go
+++ b/client/container_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_wait.go b/client/container_wait.go
index bda4a9eeee..75c03a12fa 100644
--- a/client/container_wait.go
+++ b/client/container_wait.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/container_wait_test.go b/client/container_wait_test.go
index cf10abee2d..66eccbfca2 100644
--- a/client/container_wait_test.go
+++ b/client/container_wait_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/disk_usage.go b/client/disk_usage.go
index ed788125c0..729e105715 100644
--- a/client/disk_usage.go
+++ b/client/disk_usage.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/disk_usage_test.go b/client/disk_usage_test.go
index c2a4696f1a..f7b529bebd 100644
--- a/client/disk_usage_test.go
+++ b/client/disk_usage_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/distribution_inspect.go b/client/distribution_inspect.go
index b8654b24f1..693c4121a6 100644
--- a/client/distribution_inspect.go
+++ b/client/distribution_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/distribution_inspect_test.go b/client/distribution_inspect_test.go
index ec4ef149c3..d90999b2fa 100644
--- a/client/distribution_inspect_test.go
+++ b/client/distribution_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/envvars.go b/client/envvars.go
index 61dd45c1d7..abe122d18e 100644
--- a/client/envvars.go
+++ b/client/envvars.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 const (
 	// EnvOverrideHost is the name of the environment variable that can be used
diff --git a/client/errors.go b/client/errors.go
index 7bd8593147..9e3a2538f2 100644
--- a/client/errors.go
+++ b/client/errors.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/events.go b/client/events.go
index c71d2a088f..498fe46314 100644
--- a/client/events.go
+++ b/client/events.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/events_test.go b/client/events_test.go
index 61a62e8d7c..5823772045 100644
--- a/client/events_test.go
+++ b/client/events_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/hijack.go b/client/hijack.go
index 2c78fad002..07b2e7f695 100644
--- a/client/hijack.go
+++ b/client/hijack.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bufio"
diff --git a/client/image_build.go b/client/image_build.go
index 28b74a3f1a..66ca75e4af 100644
--- a/client/image_build.go
+++ b/client/image_build.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_build_test.go b/client/image_build_test.go
index e7b7388a1f..5610391fdf 100644
--- a/client/image_build_test.go
+++ b/client/image_build_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_create.go b/client/image_create.go
index 1aa061eb01..1e044d7779 100644
--- a/client/image_create.go
+++ b/client/image_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_create_test.go b/client/image_create_test.go
index ba8535e6be..d647316190 100644
--- a/client/image_create_test.go
+++ b/client/image_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_history.go b/client/image_history.go
index 49381fb839..fce8b80e18 100644
--- a/client/image_history.go
+++ b/client/image_history.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_history_test.go b/client/image_history_test.go
index 1b51807a0c..8fb2690aea 100644
--- a/client/image_history_test.go
+++ b/client/image_history_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_import.go b/client/image_import.go
index 5849d85bd7..5236dbc62a 100644
--- a/client/image_import.go
+++ b/client/image_import.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_import_test.go b/client/image_import_test.go
index 8637c766a0..1b82d7f9be 100644
--- a/client/image_import_test.go
+++ b/client/image_import_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_inspect.go b/client/image_inspect.go
index d88f0f1410..4c35003129 100644
--- a/client/image_inspect.go
+++ b/client/image_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_inspect_test.go b/client/image_inspect_test.go
index 137c69fa78..93d28bdc8c 100644
--- a/client/image_inspect_test.go
+++ b/client/image_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_list.go b/client/image_list.go
index e1911eb7e6..ec0a2ad570 100644
--- a/client/image_list.go
+++ b/client/image_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_list_test.go b/client/image_list_test.go
index ddb38402c3..07d6094169 100644
--- a/client/image_list_test.go
+++ b/client/image_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_load.go b/client/image_load.go
index d83877d4b3..079002e943 100644
--- a/client/image_load.go
+++ b/client/image_load.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_load_test.go b/client/image_load_test.go
index d1c6d1cf13..ae418ee76b 100644
--- a/client/image_load_test.go
+++ b/client/image_load_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_prune.go b/client/image_prune.go
index 7c354d7b12..52e8bcf551 100644
--- a/client/image_prune.go
+++ b/client/image_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_prune_test.go b/client/image_prune_test.go
index 9fa56949dd..a81b0059bc 100644
--- a/client/image_prune_test.go
+++ b/client/image_prune_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_pull.go b/client/image_pull.go
index ae8c807f77..ab7606b456 100644
--- a/client/image_pull.go
+++ b/client/image_pull.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_pull_test.go b/client/image_pull_test.go
index 6ff35b66ce..cd3a09fe2f 100644
--- a/client/image_pull_test.go
+++ b/client/image_pull_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_push.go b/client/image_push.go
index 5210304403..cbbe9a25d6 100644
--- a/client/image_push.go
+++ b/client/image_push.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_push_test.go b/client/image_push_test.go
index f6c13da7a8..b2f4646ffc 100644
--- a/client/image_push_test.go
+++ b/client/image_push_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_remove.go b/client/image_remove.go
index 0d769139b8..8f357c729a 100644
--- a/client/image_remove.go
+++ b/client/image_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_remove_test.go b/client/image_remove_test.go
index 83a8cf7dee..debe8b35e0 100644
--- a/client/image_remove_test.go
+++ b/client/image_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_save.go b/client/image_save.go
index 0aa7177d20..d2102becf1 100644
--- a/client/image_save.go
+++ b/client/image_save.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_save_test.go b/client/image_save_test.go
index 204c4d3989..2cb805193d 100644
--- a/client/image_save_test.go
+++ b/client/image_save_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_search.go b/client/image_search.go
index f3aab43a80..8f5343b9da 100644
--- a/client/image_search.go
+++ b/client/image_search.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_search_test.go b/client/image_search_test.go
index 8ae9b40ba6..cef9337475 100644
--- a/client/image_search_test.go
+++ b/client/image_search_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/image_tag.go b/client/image_tag.go
index 25c7360df1..2bfafc51cd 100644
--- a/client/image_tag.go
+++ b/client/image_tag.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/image_tag_test.go b/client/image_tag_test.go
index 173477f746..9e6c2fb141 100644
--- a/client/image_tag_test.go
+++ b/client/image_tag_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/info.go b/client/info.go
index 6396f4b60f..ed85d7f8d9 100644
--- a/client/info.go
+++ b/client/info.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/info_test.go b/client/info_test.go
index 4c5e3176c9..01674ee885 100644
--- a/client/info_test.go
+++ b/client/info_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/login.go b/client/login.go
index d3572c1bf4..2d7f179023 100644
--- a/client/login.go
+++ b/client/login.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/network_connect.go b/client/network_connect.go
index fa7cc34faa..f7526c5d8e 100644
--- a/client/network_connect.go
+++ b/client/network_connect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/network_connect_test.go b/client/network_connect_test.go
index 06a7fc081b..3c20715167 100644
--- a/client/network_connect_test.go
+++ b/client/network_connect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_create.go b/client/network_create.go
index eef9514456..6a7f2ea52e 100644
--- a/client/network_create.go
+++ b/client/network_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/network_create_test.go b/client/network_create_test.go
index 2c225f1173..76d4dec6c6 100644
--- a/client/network_create_test.go
+++ b/client/network_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_disconnect.go b/client/network_disconnect.go
index d8051df2fa..55f9b6a206 100644
--- a/client/network_disconnect.go
+++ b/client/network_disconnect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/network_disconnect_test.go b/client/network_disconnect_test.go
index 9d8df53978..946d52c20f 100644
--- a/client/network_disconnect_test.go
+++ b/client/network_disconnect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_inspect.go b/client/network_inspect.go
index 1387c080a5..734ec10211 100644
--- a/client/network_inspect.go
+++ b/client/network_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_inspect_test.go b/client/network_inspect_test.go
index 447f90723b..5676a707ac 100644
--- a/client/network_inspect_test.go
+++ b/client/network_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_list.go b/client/network_list.go
index e1b4fca731..8d93361966 100644
--- a/client/network_list.go
+++ b/client/network_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/network_list_test.go b/client/network_list_test.go
index eac1bcd604..ac1af894f0 100644
--- a/client/network_list_test.go
+++ b/client/network_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_prune.go b/client/network_prune.go
index 90d3679f38..7835fe9069 100644
--- a/client/network_prune.go
+++ b/client/network_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/network_prune_test.go b/client/network_prune_test.go
index 209d1cba36..269257c3a6 100644
--- a/client/network_prune_test.go
+++ b/client/network_prune_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/network_remove.go b/client/network_remove.go
index 89fdaaf3a8..9b164d3eae 100644
--- a/client/network_remove.go
+++ b/client/network_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import "context"
 
diff --git a/client/network_remove_test.go b/client/network_remove_test.go
index b6a0c7c1fb..3c724d8fbb 100644
--- a/client/network_remove_test.go
+++ b/client/network_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/node_inspect.go b/client/node_inspect.go
index 5d3343dc40..dd1f1f8ab4 100644
--- a/client/node_inspect.go
+++ b/client/node_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/node_inspect_test.go b/client/node_inspect_test.go
index 46dfdeda00..7617ef1653 100644
--- a/client/node_inspect_test.go
+++ b/client/node_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/node_list.go b/client/node_list.go
index 429eec2443..3b393ffe38 100644
--- a/client/node_list.go
+++ b/client/node_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/node_list_test.go b/client/node_list_test.go
index 03b8a67010..cc7c9adf85 100644
--- a/client/node_list_test.go
+++ b/client/node_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/node_remove.go b/client/node_remove.go
index 07d8e65364..644fe13810 100644
--- a/client/node_remove.go
+++ b/client/node_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/node_remove_test.go b/client/node_remove_test.go
index 4594baf5a5..188233c7f4 100644
--- a/client/node_remove_test.go
+++ b/client/node_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/node_update.go b/client/node_update.go
index 10e2186615..62af964cf0 100644
--- a/client/node_update.go
+++ b/client/node_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/node_update_test.go b/client/node_update_test.go
index 3388fa0519..f8976d2040 100644
--- a/client/node_update_test.go
+++ b/client/node_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/ping.go b/client/ping.go
index 2ffa5945f4..385fdf0524 100644
--- a/client/ping.go
+++ b/client/ping.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/ping_test.go b/client/ping_test.go
index 0b3a2b3ec1..bffc17fe63 100644
--- a/client/ping_test.go
+++ b/client/ping_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_create.go b/client/plugin_create.go
index b95dbaf686..eaba7ee653 100644
--- a/client/plugin_create.go
+++ b/client/plugin_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_disable.go b/client/plugin_disable.go
index 9fabe77bf6..4049b1b6ac 100644
--- a/client/plugin_disable.go
+++ b/client/plugin_disable.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_disable_test.go b/client/plugin_disable_test.go
index 4bc39f73ed..4f14e64a6a 100644
--- a/client/plugin_disable_test.go
+++ b/client/plugin_disable_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_enable.go b/client/plugin_enable.go
index 492d0bcff5..611856935d 100644
--- a/client/plugin_enable.go
+++ b/client/plugin_enable.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_enable_test.go b/client/plugin_enable_test.go
index 7bf3ff0759..e1663c3ce8 100644
--- a/client/plugin_enable_test.go
+++ b/client/plugin_enable_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_inspect.go b/client/plugin_inspect.go
index 8f107a760e..eaedeb8a67 100644
--- a/client/plugin_inspect.go
+++ b/client/plugin_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_inspect_test.go b/client/plugin_inspect_test.go
index 5ec3885f14..2e94e24495 100644
--- a/client/plugin_inspect_test.go
+++ b/client/plugin_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_install.go b/client/plugin_install.go
index 8553961ba6..5fd2ff2182 100644
--- a/client/plugin_install.go
+++ b/client/plugin_install.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_list.go b/client/plugin_list.go
index 03bcf7621d..f314e17f1e 100644
--- a/client/plugin_list.go
+++ b/client/plugin_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_list_test.go b/client/plugin_list_test.go
index 8ef270a20d..e5fa2aa973 100644
--- a/client/plugin_list_test.go
+++ b/client/plugin_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_push.go b/client/plugin_push.go
index da15e449d8..4574dcddbf 100644
--- a/client/plugin_push.go
+++ b/client/plugin_push.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_push_test.go b/client/plugin_push_test.go
index 9f56692701..430badf72c 100644
--- a/client/plugin_push_test.go
+++ b/client/plugin_push_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_remove.go b/client/plugin_remove.go
index 6ee107e3cc..2ba0a8ccc4 100644
--- a/client/plugin_remove.go
+++ b/client/plugin_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_remove_test.go b/client/plugin_remove_test.go
index b19b7e3dd4..b15d2c05fe 100644
--- a/client/plugin_remove_test.go
+++ b/client/plugin_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_set.go b/client/plugin_set.go
index e2a79838d5..f0e4a0c305 100644
--- a/client/plugin_set.go
+++ b/client/plugin_set.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/plugin_set_test.go b/client/plugin_set_test.go
index ea1e0deb6c..a5958afff7 100644
--- a/client/plugin_set_test.go
+++ b/client/plugin_set_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/plugin_upgrade.go b/client/plugin_upgrade.go
index 4abb29cf01..cd0cf4d222 100644
--- a/client/plugin_upgrade.go
+++ b/client/plugin_upgrade.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/request.go b/client/request.go
index d9074a736c..254138fc22 100644
--- a/client/request.go
+++ b/client/request.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/request_test.go b/client/request_test.go
index c6bf359b9f..9d2976d78e 100644
--- a/client/request_test.go
+++ b/client/request_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/secret_create.go b/client/secret_create.go
index aee051b902..be4a1da456 100644
--- a/client/secret_create.go
+++ b/client/secret_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/secret_create_test.go b/client/secret_create_test.go
index e8761fccf7..6ece7cad4b 100644
--- a/client/secret_create_test.go
+++ b/client/secret_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/secret_inspect.go b/client/secret_inspect.go
index fdabc197f0..f44c00e755 100644
--- a/client/secret_inspect.go
+++ b/client/secret_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/secret_inspect_test.go b/client/secret_inspect_test.go
index 01df1f7784..4f8797742f 100644
--- a/client/secret_inspect_test.go
+++ b/client/secret_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/secret_list.go b/client/secret_list.go
index b158d99ed9..2e37bda273 100644
--- a/client/secret_list.go
+++ b/client/secret_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/secret_list_test.go b/client/secret_list_test.go
index 86ed2f734d..c82521c2b8 100644
--- a/client/secret_list_test.go
+++ b/client/secret_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/secret_remove.go b/client/secret_remove.go
index 7ea2acbf52..d1044aaf85 100644
--- a/client/secret_remove.go
+++ b/client/secret_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import "context"
 
diff --git a/client/secret_remove_test.go b/client/secret_remove_test.go
index 04b2d1e79b..9eb7fafc9d 100644
--- a/client/secret_remove_test.go
+++ b/client/secret_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/secret_update.go b/client/secret_update.go
index 60d21a6f2c..a0aff7cb69 100644
--- a/client/secret_update.go
+++ b/client/secret_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/secret_update_test.go b/client/secret_update_test.go
index de79c7705d..6de1b4bfa8 100644
--- a/client/secret_update_test.go
+++ b/client/secret_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_create.go b/client/service_create.go
index 6b9932ae2e..db7566a85d 100644
--- a/client/service_create.go
+++ b/client/service_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/service_create_test.go b/client/service_create_test.go
index fe8191539f..edececa709 100644
--- a/client/service_create_test.go
+++ b/client/service_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_inspect.go b/client/service_inspect.go
index 892e9004fe..cb25ade174 100644
--- a/client/service_inspect.go
+++ b/client/service_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_inspect_test.go b/client/service_inspect_test.go
index 3ccd91b93a..9576a435de 100644
--- a/client/service_inspect_test.go
+++ b/client/service_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_list.go b/client/service_list.go
index 019873bb6d..26b25ff0be 100644
--- a/client/service_list.go
+++ b/client/service_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/service_list_test.go b/client/service_list_test.go
index 2f9b54cbbf..ce0f655654 100644
--- a/client/service_list_test.go
+++ b/client/service_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_logs.go b/client/service_logs.go
index 6e0cbee49f..8bf0408261 100644
--- a/client/service_logs.go
+++ b/client/service_logs.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/service_logs_test.go b/client/service_logs_test.go
index ec2f91dcfa..a670cbd132 100644
--- a/client/service_logs_test.go
+++ b/client/service_logs_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_remove.go b/client/service_remove.go
index 93c949e44a..0c7cc571e0 100644
--- a/client/service_remove.go
+++ b/client/service_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import "context"
 
diff --git a/client/service_remove_test.go b/client/service_remove_test.go
index 5fef0645b7..d7de76abf8 100644
--- a/client/service_remove_test.go
+++ b/client/service_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/service_update.go b/client/service_update.go
index e0c1a26648..278e305d02 100644
--- a/client/service_update.go
+++ b/client/service_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/service_update_test.go b/client/service_update_test.go
index 2b34bbee45..c5cb0eca5d 100644
--- a/client/service_update_test.go
+++ b/client/service_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_get_unlock_key.go b/client/swarm_get_unlock_key.go
index 6e30daf615..41151f6cd2 100644
--- a/client/swarm_get_unlock_key.go
+++ b/client/swarm_get_unlock_key.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_get_unlock_key_test.go b/client/swarm_get_unlock_key_test.go
index a9ce6b8917..849cbb72e4 100644
--- a/client/swarm_get_unlock_key_test.go
+++ b/client/swarm_get_unlock_key_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_init.go b/client/swarm_init.go
index 3dcb2a5b52..7f29165493 100644
--- a/client/swarm_init.go
+++ b/client/swarm_init.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_init_test.go b/client/swarm_init_test.go
index ec5883a878..97fbdd3c19 100644
--- a/client/swarm_init_test.go
+++ b/client/swarm_init_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_inspect.go b/client/swarm_inspect.go
index 3d5a8a042e..597693bd33 100644
--- a/client/swarm_inspect.go
+++ b/client/swarm_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_inspect_test.go b/client/swarm_inspect_test.go
index 9e29130758..83c188380e 100644
--- a/client/swarm_inspect_test.go
+++ b/client/swarm_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_join.go b/client/swarm_join.go
index a1cf0455d2..446d4d0482 100644
--- a/client/swarm_join.go
+++ b/client/swarm_join.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_join_test.go b/client/swarm_join_test.go
index 4366a6dada..de2bc5092c 100644
--- a/client/swarm_join_test.go
+++ b/client/swarm_join_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_leave.go b/client/swarm_leave.go
index 90ca84b363..709e5adb35 100644
--- a/client/swarm_leave.go
+++ b/client/swarm_leave.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_leave_test.go b/client/swarm_leave_test.go
index fa3935986d..efa4d50cd6 100644
--- a/client/swarm_leave_test.go
+++ b/client/swarm_leave_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_unlock.go b/client/swarm_unlock.go
index 745d64d5ba..e3c756b661 100644
--- a/client/swarm_unlock.go
+++ b/client/swarm_unlock.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_unlock_test.go b/client/swarm_unlock_test.go
index 817077e579..841fc0fb29 100644
--- a/client/swarm_unlock_test.go
+++ b/client/swarm_unlock_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/swarm_update.go b/client/swarm_update.go
index 9fde7d75ee..309ab194a4 100644
--- a/client/swarm_update.go
+++ b/client/swarm_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/swarm_update_test.go b/client/swarm_update_test.go
index e94ff54729..21a923e98b 100644
--- a/client/swarm_update_test.go
+++ b/client/swarm_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/task_inspect.go b/client/task_inspect.go
index 37668bd278..ca3924fc48 100644
--- a/client/task_inspect.go
+++ b/client/task_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/task_inspect_test.go b/client/task_inspect_test.go
index b8cd66d5f5..002de669f3 100644
--- a/client/task_inspect_test.go
+++ b/client/task_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/task_list.go b/client/task_list.go
index 5d540c3832..de743e99c5 100644
--- a/client/task_list.go
+++ b/client/task_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/task_list_test.go b/client/task_list_test.go
index cfff55d297..b954796003 100644
--- a/client/task_list_test.go
+++ b/client/task_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/task_logs.go b/client/task_logs.go
index 9dcb977b3c..baa55528a7 100644
--- a/client/task_logs.go
+++ b/client/task_logs.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/utils.go b/client/utils.go
index 27f2b9884b..c6d065c9a8 100644
--- a/client/utils.go
+++ b/client/utils.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"encoding/json"
diff --git a/client/version.go b/client/version.go
index 4566fd98e5..046af16cc5 100644
--- a/client/version.go
+++ b/client/version.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/volume_create.go b/client/volume_create.go
index bedb3abbb7..1aad3f479c 100644
--- a/client/volume_create.go
+++ b/client/volume_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/volume_create_test.go b/client/volume_create_test.go
index 4035434c15..ac0a7f5ba1 100644
--- a/client/volume_create_test.go
+++ b/client/volume_create_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/volume_inspect.go b/client/volume_inspect.go
index ce32bbbb7f..389a4a71aa 100644
--- a/client/volume_inspect.go
+++ b/client/volume_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/volume_inspect_test.go b/client/volume_inspect_test.go
index f21311816f..361d714aef 100644
--- a/client/volume_inspect_test.go
+++ b/client/volume_inspect_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/volume_list.go b/client/volume_list.go
index de6ce23a45..61ed518cd6 100644
--- a/client/volume_list.go
+++ b/client/volume_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/volume_list_test.go b/client/volume_list_test.go
index 5a824c4ce7..8ea0fcb9f5 100644
--- a/client/volume_list_test.go
+++ b/client/volume_list_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/volume_prune.go b/client/volume_prune.go
index 7da148feac..e22f0072f9 100644
--- a/client/volume_prune.go
+++ b/client/volume_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/volume_remove.go b/client/volume_remove.go
index eefd9ce437..e2a53fa9b8 100644
--- a/client/volume_remove.go
+++ b/client/volume_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/volume_remove_test.go b/client/volume_remove_test.go
index bcdd04c187..742fe5bdb0 100644
--- a/client/volume_remove_test.go
+++ b/client/volume_remove_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"
diff --git a/client/volume_update.go b/client/volume_update.go
index c91d5e984e..879932f008 100644
--- a/client/volume_update.go
+++ b/client/volume_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"context"
diff --git a/client/volume_update_test.go b/client/volume_update_test.go
index 476733425d..a1e8ec5753 100644
--- a/client/volume_update_test.go
+++ b/client/volume_update_test.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
 
 import (
 	"bytes"