diff --git a/cmd/plugin/cmd/delete.go b/cmd/plugin/cmd/delete.go
index 1427d70c2..6ab6c76d4 100644
--- a/cmd/plugin/cmd/delete.go
+++ b/cmd/plugin/cmd/delete.go
@@ -24,18 +24,18 @@ import (
 )
 
 type deleteOptions struct {
-	kubeconfig                string
-	kubeconfigContext         string
-	coreProvider              string
-	bootstrapProviders        []string
-	controlPlaneProviders     []string
-	infrastructureProviders   []string
-	ipamProviders             []string
-	runtimeExtensionProviders []string
-	addonProviders            []string
-	includeNamespace          bool
-	includeCRDs               bool
-	deleteAll                 bool
+	kubeconfig              string
+	kubeconfigContext       string
+	coreProvider            string
+	bootstrapProviders      []string
+	controlPlaneProviders   []string
+	infrastructureProviders []string
+	// ipamProviders             []string
+	// runtimeExtensionProviders []string
+	addonProviders   []string
+	includeNamespace bool
+	includeCRDs      bool
+	deleteAll        bool
 }
 
 var deleteOpts = &deleteOptions{}
@@ -106,10 +106,10 @@ func init() {
 		"Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster")
 	deleteCmd.Flags().StringSliceVarP(&deleteOpts.controlPlaneProviders, "control-plane", "c", nil,
 		"ControlPlane providers and versions (e.g. kubeadm:v1.1.5) to delete from the management cluster")
-	deleteCmd.Flags().StringSliceVar(&deleteOpts.ipamProviders, "ipam", nil,
-		"IPAM providers and versions (e.g. infoblox:v0.0.1) to delete from the management cluster")
-	deleteCmd.Flags().StringSliceVar(&deleteOpts.runtimeExtensionProviders, "runtime-extension", nil,
-		"Runtime extension providers and versions (e.g. test:v0.0.1) to delete from the management cluster")
+	// deleteCmd.Flags().StringSliceVar(&deleteOpts.ipamProviders, "ipam", nil,
+	//	"IPAM providers and versions (e.g. infoblox:v0.0.1) to delete from the management cluster")
+	// deleteCmd.Flags().StringSliceVar(&deleteOpts.runtimeExtensionProviders, "runtime-extension", nil,
+	//	"Runtime extension providers and versions (e.g. test:v0.0.1) to delete from the management cluster")
 	deleteCmd.Flags().StringSliceVar(&deleteOpts.addonProviders, "addon", nil,
 		"Add-on providers and versions (e.g. helm:v0.1.0) to delete from the management cluster")
 
@@ -126,8 +126,8 @@ func runDelete() error {
 		(len(deleteOpts.bootstrapProviders) > 0) ||
 		(len(deleteOpts.controlPlaneProviders) > 0) ||
 		(len(deleteOpts.infrastructureProviders) > 0) ||
-		(len(deleteOpts.ipamProviders) > 0) ||
-		(len(deleteOpts.runtimeExtensionProviders) > 0) ||
+		// (len(deleteOpts.ipamProviders) > 0) ||
+		// (len(deleteOpts.runtimeExtensionProviders) > 0) ||
 		(len(deleteOpts.addonProviders) > 0)
 
 	if deleteOpts.deleteAll && hasProviderNames {
diff --git a/cmd/plugin/cmd/init.go b/cmd/plugin/cmd/init.go
index 32cf73df8..26bd36ee3 100644
--- a/cmd/plugin/cmd/init.go
+++ b/cmd/plugin/cmd/init.go
@@ -24,19 +24,19 @@ import (
 )
 
 type initOptions struct {
-	kubeconfig                string
-	kubeconfigContext         string
-	coreProvider              string
-	bootstrapProviders        []string
-	controlPlaneProviders     []string
-	infrastructureProviders   []string
-	ipamProviders             []string
-	runtimeExtensionProviders []string
-	addonProviders            []string
-	targetNamespace           string
-	validate                  bool
-	waitProviders             bool
-	waitProviderTimeout       int
+	kubeconfig              string
+	kubeconfigContext       string
+	coreProvider            string
+	bootstrapProviders      []string
+	controlPlaneProviders   []string
+	infrastructureProviders []string
+	// ipamProviders             []string
+	// runtimeExtensionProviders []string
+	addonProviders      []string
+	targetNamespace     string
+	validate            bool
+	waitProviders       bool
+	waitProviderTimeout int
 }
 
 var initOpts = &initOptions{}
@@ -102,10 +102,10 @@ func init() {
 		"Bootstrap providers and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. If unspecified, Kubeadm bootstrap provider's latest release is used.")
 	initCmd.PersistentFlags().StringSliceVarP(&initOpts.controlPlaneProviders, "control-plane", "c", nil,
 		"Control plane providers and versions (e.g. kubeadm:v1.1.5) to add to the management cluster. If unspecified, the Kubeadm control plane provider's latest release is used.")
-	initCmd.PersistentFlags().StringSliceVar(&initOpts.ipamProviders, "ipam", nil,
-		"IPAM providers and versions (e.g. infoblox:v0.0.1) to add to the management cluster.")
-	initCmd.PersistentFlags().StringSliceVar(&initOpts.runtimeExtensionProviders, "runtime-extension", nil,
-		"Runtime extension providers and versions (e.g. test:v0.0.1) to add to the management cluster.")
+	// initCmd.PersistentFlags().StringSliceVar(&initOpts.ipamProviders, "ipam", nil,
+	//	"IPAM providers and versions (e.g. infoblox:v0.0.1) to add to the management cluster.")
+	// initCmd.PersistentFlags().StringSliceVar(&initOpts.runtimeExtensionProviders, "runtime-extension", nil,
+	//	"Runtime extension providers and versions (e.g. test:v0.0.1) to add to the management cluster.")
 	initCmd.PersistentFlags().StringSliceVar(&initOpts.addonProviders, "addon", nil,
 		"Add-on providers and versions (e.g. helm:v0.1.0) to add to the management cluster.")
 	initCmd.Flags().StringVarP(&initOpts.targetNamespace, "target-namespace", "n", "capi-operator-system",
diff --git a/cmd/plugin/cmd/upgrade_apply.go b/cmd/plugin/cmd/upgrade_apply.go
index d6fa1a339..e53978195 100644
--- a/cmd/plugin/cmd/upgrade_apply.go
+++ b/cmd/plugin/cmd/upgrade_apply.go
@@ -24,18 +24,18 @@ import (
 )
 
 type upgradeApplyOptions struct {
-	kubeconfig                string
-	kubeconfigContext         string
-	contract                  string
-	coreProvider              string
-	bootstrapProviders        []string
-	controlPlaneProviders     []string
-	infrastructureProviders   []string
-	ipamProviders             []string
-	runtimeExtensionProviders []string
-	addonProviders            []string
-	waitProviders             bool
-	waitProviderTimeout       int
+	kubeconfig              string
+	kubeconfigContext       string
+	contract                string
+	coreProvider            string
+	bootstrapProviders      []string
+	controlPlaneProviders   []string
+	infrastructureProviders []string
+	// ipamProviders             []string
+	// runtimeExtensionProviders []string
+	addonProviders      []string
+	waitProviders       bool
+	waitProviderTimeout int
 }
 
 var upgradeApplyOpts = &upgradeApplyOptions{}
@@ -80,10 +80,10 @@ func init() {
 		"Bootstrap providers instance and versions (e.g. kubeadm:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
 	upgradeApplyCmd.Flags().StringSliceVarP(&upgradeApplyOpts.controlPlaneProviders, "control-plane", "c", nil,
 		"ControlPlane providers instance and versions (e.g. kubeadm:v1.1.5) to upgrade to. This flag can be used as alternative to --contract.")
-	upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.ipamProviders, "ipam", nil,
-		"IPAM providers and versions (e.g. infoblox:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
-	upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.runtimeExtensionProviders, "runtime-extension", nil,
-		"Runtime extension providers and versions (e.g. test:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
+	// upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.ipamProviders, "ipam", nil,
+	//	"IPAM providers and versions (e.g. infoblox:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
+	// upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.runtimeExtensionProviders, "runtime-extension", nil,
+	//	"Runtime extension providers and versions (e.g. test:v0.0.1) to upgrade to. This flag can be used as alternative to --contract.")
 	upgradeApplyCmd.Flags().StringSliceVar(&upgradeApplyOpts.addonProviders, "addon", nil,
 		"Add-on providers and versions (e.g. helm:v0.1.0) to upgrade to. This flag can be used as alternative to --contract.")
 	upgradeApplyCmd.Flags().BoolVar(&upgradeApplyOpts.waitProviders, "wait-providers", false,
@@ -99,8 +99,8 @@ func runUpgradeApply() error {
 		(len(upgradeApplyOpts.bootstrapProviders) > 0) ||
 		(len(upgradeApplyOpts.controlPlaneProviders) > 0) ||
 		(len(upgradeApplyOpts.infrastructureProviders) > 0) ||
-		(len(upgradeApplyOpts.ipamProviders) > 0) ||
-		(len(upgradeApplyOpts.runtimeExtensionProviders) > 0) ||
+		// (len(upgradeApplyOpts.ipamProviders) > 0) ||
+		// (len(upgradeApplyOpts.runtimeExtensionProviders) > 0) ||
 		(len(upgradeApplyOpts.addonProviders) > 0)
 
 	if upgradeApplyOpts.contract == "" && !hasProviderNames {