diff --git a/cli/main.go b/cli/main.go
index de7db9fb8..26b2c2071 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -64,7 +64,6 @@ var (
 		"context": {},
 		"login":   {},
 		"logout":  {},
-		"secret":  {},
 		"serve":   {},
 		"version": {},
 	}
diff --git a/cli/mobycli/delegate_ecs.go b/cli/mobycli/delegate_ecs.go
deleted file mode 100644
index 65415e8c0..000000000
--- a/cli/mobycli/delegate_ecs.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build !ecs
-
-/*
-   Copyright 2020 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package mobycli
-
-import "github.com/docker/api/context/store"
-
-func init() {
-	delegatedContextTypes = append(delegatedContextTypes, store.AwsContextType, store.EcsContextType)
-}
diff --git a/cli/mobycli/exec.go b/cli/mobycli/exec.go
index 967747fab..ace7c8aec 100644
--- a/cli/mobycli/exec.go
+++ b/cli/mobycli/exec.go
@@ -28,7 +28,7 @@ import (
 	"github.com/docker/api/context/store"
 )
 
-var delegatedContextTypes = []string{store.DefaultContextType}
+var delegatedContextTypes = []string{store.DefaultContextType, store.AwsContextType}
 
 // ComDockerCli name of the classic cli binary
 const ComDockerCli = "com.docker.cli"