diff --git a/cmd/edenPacket.go b/cmd/edenPacket.go
index 3f0e22e29..fc23b8b8e 100644
--- a/cmd/edenPacket.go
+++ b/cmd/edenPacket.go
@@ -34,7 +34,7 @@ func newPacketVMCmd(cfg *openevec.EdenSetupArgs, packetKey, packetProjectName *s
 		{
 			Message: "Basic Commands",
 			Commands: []*cobra.Command{
-				newPacketRunCmd(cfg, packetKey, packetProjectName),
+				newPacketRunCmd(packetKey, packetProjectName),
 				newPacketDeleteCmd(packetKey, packetProjectName),
 				newPacketGetIPCmd(packetKey, packetProjectName),
 			},
@@ -46,7 +46,7 @@ func newPacketVMCmd(cfg *openevec.EdenSetupArgs, packetKey, packetProjectName *s
 	return packetVMCmd
 }
 
-func newPacketRunCmd(cfg *openevec.EdenSetupArgs, packetKey, packetProjectName *string) *cobra.Command {
+func newPacketRunCmd(packetKey, packetProjectName *string) *cobra.Command {
 	var packetVMName, packetZone, packetMachineType, packetIPXEUrl string
 
 	var packetRun = &cobra.Command{
diff --git a/cmd/edenPod.go b/cmd/edenPod.go
index 380a15473..28c827b39 100644
--- a/cmd/edenPod.go
+++ b/cmd/edenPod.go
@@ -24,18 +24,18 @@ func newPodCmd(configName, verbosity *string) *cobra.Command {
 			Commands: []*cobra.Command{
 				newPodDeployCmd(cfg),
 				newPodStopCmd(),
-				newPodStartCmd(cfg),
+				newPodStartCmd(),
 				newPodDeleteCmd(),
-				newPodRestartCmd(cfg),
+				newPodRestartCmd(),
 				newPodPurgeCmd(),
-				newPodModifyCmd(cfg),
-				newPodPublishCmd(cfg),
+				newPodModifyCmd(),
+				newPodPublishCmd(),
 			},
 		},
 		{
 			Message: "Printing Commands",
 			Commands: []*cobra.Command{
-				newPodPsCmd(cfg),
+				newPodPsCmd(),
 				newPodLogsCmd(cfg),
 			},
 		},
@@ -46,7 +46,7 @@ func newPodCmd(configName, verbosity *string) *cobra.Command {
 	return podCmd
 }
 
-func newPodPublishCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newPodPublishCmd() *cobra.Command {
 	var kernelFile, initrdFile, rootFile, formatStr, arch string
 	var disks []string
 	var local bool
@@ -126,7 +126,7 @@ You can set access VLAN ID (VID) for a particular network in the format '<networ
 	return podDeployCmd
 }
 
-func newPodPsCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newPodPsCmd() *cobra.Command {
 	var outputFormat types.OutputFormat
 	var podPsCmd = &cobra.Command{
 		Use:   "ps",
@@ -182,7 +182,7 @@ func newPodPurgeCmd() *cobra.Command {
 	return podPurgeCmd
 }
 
-func newPodRestartCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newPodRestartCmd() *cobra.Command {
 	var podRestartCmd = &cobra.Command{
 		Use:   "restart",
 		Short: "Restart pod",
@@ -198,7 +198,7 @@ func newPodRestartCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	return podRestartCmd
 }
 
-func newPodStartCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newPodStartCmd() *cobra.Command {
 	var podStartCmd = &cobra.Command{
 		Use:   "start",
 		Short: "Start pod",
@@ -263,7 +263,7 @@ func newPodLogsCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	return podLogsCmd
 }
 
-func newPodModifyCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newPodModifyCmd() *cobra.Command {
 	var podNetworks, portPublish, acl, vlans []string
 	var startDelay uint32
 
diff --git a/cmd/edenRol.go b/cmd/edenRol.go
index 63cdf7811..e77185393 100644
--- a/cmd/edenRol.go
+++ b/cmd/edenRol.go
@@ -16,12 +16,12 @@ func newRolCmd(configName, verbosity *string) *cobra.Command {
 		PersistentPreRunE: preRunViperLoadFunction(cfg, configName, verbosity),
 	}
 
-	rolCmd.AddCommand(newRolRentCmd(cfg))
+	rolCmd.AddCommand(newRolRentCmd())
 
 	return rolCmd
 }
 
-func newRolRentCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newRolRentCmd() *cobra.Command {
 	var rolProjectID string
 
 	var rolRentCmd = &cobra.Command{
@@ -34,7 +34,7 @@ func newRolRentCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 		{
 			Message: "Basic Commands",
 			Commands: []*cobra.Command{
-				newCreateRentCmd(&rolProjectID, cfg),
+				newCreateRentCmd(&rolProjectID),
 				newCloseRentCmd(&rolProjectID),
 				newGetRentCmd(&rolProjectID),
 				newGetRentConsoleOutputCmd(&rolProjectID),
@@ -72,7 +72,7 @@ func newGetRentConsoleOutputCmd(rolProjectID *string) *cobra.Command {
 	return getRentConsoleOutputCmd
 }
 
-func newCreateRentCmd(rolProjectID *string, cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newCreateRentCmd(rolProjectID *string) *cobra.Command {
 	var rolRentName, rolModel, rolManufacturer, rolIPXEUrl string
 
 	var createRentCmd = &cobra.Command{
diff --git a/cmd/edenUtils.go b/cmd/edenUtils.go
index ceca28353..0e98325e1 100644
--- a/cmd/edenUtils.go
+++ b/cmd/edenUtils.go
@@ -34,8 +34,8 @@ func newUtilsCmd(configName, verbosity *string) *cobra.Command {
 				newSdInfoEveCmd(),
 				newDebugCmd(cfg),
 				newUploadGitCmd(),
-				newImportCmd(cfg),
-				newExportCmd(cfg),
+				newImportCmd(),
+				newExportCmd(),
 			},
 		},
 	}
@@ -192,7 +192,7 @@ func newTemplateCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	return templateCmd
 }
 
-func newExportCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newExportCmd() *cobra.Command {
 	var exportCmd = &cobra.Command{
 		Use:   "export <filename>",
 		Short: "export harness",
@@ -210,7 +210,7 @@ func newExportCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 
 }
 
-func newImportCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newImportCmd() *cobra.Command {
 	var rewriteRoot bool
 
 	var importCmd = &cobra.Command{
diff --git a/cmd/eve.go b/cmd/eve.go
index c95bd74ec..6c1919429 100644
--- a/cmd/eve.go
+++ b/cmd/eve.go
@@ -26,11 +26,11 @@ func newEveCmd(configName, verbosity *string) *cobra.Command {
 				newStartEveCmd(cfg),
 				newStopEveCmd(cfg),
 				newStatusEveCmd(cfg),
-				newIpEveCmd(cfg),
+				newIpEveCmd(),
 				newSshEveCmd(cfg),
 				newConsoleEveCmd(cfg),
 				newOnboardEveCmd(cfg),
-				newResetEveCmd(cfg),
+				newResetEveCmd(),
 				newVersionEveCmd(),
 				newEpochEveCmd(),
 				newLinkEveCmd(cfg),
@@ -156,7 +156,7 @@ func newStatusEveCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	return statusEveCmd
 }
 
-func newIpEveCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newIpEveCmd() *cobra.Command {
 	var ipEveCmd = &cobra.Command{
 		Use:   "ip",
 		Short: "ip of eve",
@@ -230,7 +230,7 @@ func newOnboardEveCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	return onboardEveCmd
 }
 
-func newResetEveCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newResetEveCmd() *cobra.Command {
 	var resetEveCmd = &cobra.Command{
 		Use:   "reset",
 		Short: "Reset EVE to initial config",
diff --git a/cmd/registry.go b/cmd/registry.go
index c4fc767ad..4d0f10156 100644
--- a/cmd/registry.go
+++ b/cmd/registry.go
@@ -22,7 +22,7 @@ func newRegistryCmd(configName, verbosity *string) *cobra.Command {
 			Message: "Basic Commands",
 			Commands: []*cobra.Command{
 				newStartRegistryCmd(cfg),
-				newStopRegistryCmd(cfg),
+				newStopRegistryCmd(),
 				newStatusRegistryCmd(),
 				newLoadRegistryCmd(cfg),
 			},
@@ -53,7 +53,7 @@ func newStartRegistryCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
 	return startRegistryCmd
 }
 
-func newStopRegistryCmd(cfg *openevec.EdenSetupArgs) *cobra.Command {
+func newStopRegistryCmd() *cobra.Command {
 	var registryRm bool
 
 	var stopRegistryCmd = &cobra.Command{