diff --git a/README.md b/README.md
index 62ce6fc..d1ffda6 100644
--- a/README.md
+++ b/README.md
@@ -84,54 +84,23 @@ The ElevenLabs CLI supports managing agents, tools, and tests across multiple is
 #### Login to Multiple Environments
 
 ```bash
-# Login to production
-elevenlabs auth login --env prod
-
-# Login to staging
-elevenlabs auth login --env staging
-
-# Login to development
-elevenlabs auth login --env dev
+# Login with your API key
+elevenlabs auth login
 ```
 
-Each environment stores its API key securely and independently.
-
-#### Check All Environments
+#### Check Authentication Status
 
 ```bash
 elevenlabs auth whoami
-# Shows all configured environments and their authentication status
+# Shows your authentication status
 ```
 
-#### Logout from Specific Environment
+#### Logout
 
 ```bash
-elevenlabs auth logout --env dev
-```
-
-#### Environment Field in Configurations
-
-Agent, tool, and test definitions include an `env` field:
-
-```json
-{
-  "agents": [
-    {
-      "config": "agent_configs/support_bot.json",
-      "id": "agent_123",
-      "env": "prod"
-    },
-    {
-      "config": "agent_configs/support_bot_dev.json", 
-      "id": "agent_456",
-      "env": "dev"
-    }
-  ]
-}
+elevenlabs auth logout
 ```
 
-When `env` is not specified, it defaults to `prod`.
-
 ## Quick Start
 
 ```bash
@@ -141,7 +110,7 @@ elevenlabs agents init
 # Or override existing configuration
 elevenlabs agents init --override
 
-# 2. Login with API key (defaults to 'prod' environment)
+# 2. Login with API key
 elevenlabs auth login
 
 # 3. Create agent with template
@@ -204,37 +173,37 @@ elevenlabs auth logout
 elevenlabs auth whoami
 
 # Create agent
-elevenlabs agents add "Agent Name" [--template customer-service] [--env prod]
+elevenlabs agents add "Agent Name" [--template customer-service]
 
 # Create webhook tool
-elevenlabs tools add-webhook "Tool Name" [--config-path path] [--env prod]
+elevenlabs tools add-webhook "Tool Name" [--config-path path]
 
 # Create client tool
-elevenlabs tools add-client "Tool Name" [--config-path path] [--env prod]
+elevenlabs tools add-client "Tool Name" [--config-path path]
 
-# Push changes (operates on all environments by default)
-elevenlabs agents push [--agent "Agent Name"] [--env prod] [--dry-run]
+# Push changes
+elevenlabs agents push [--agent "Agent Name"] [--dry-run]
 
-# Sync tools (operates on all environments by default)
-elevenlabs tools push [--tool "Tool Name"] [--env prod] [--dry-run]
+# Sync tools
+elevenlabs tools push [--tool "Tool Name"] [--dry-run]
 
-# Sync tests (operates on all environments by default)
-elevenlabs tests push [--env prod] [--dry-run]
+# Sync tests
+elevenlabs tests push [--dry-run]
 
 # Check status
 elevenlabs agents status [--agent "Agent Name"]
 
-# Pull agents from ElevenLabs (pulls from all environments by default)
-elevenlabs agents pull [--search "term"] [--env prod] [--dry-run]
+# Pull agents from ElevenLabs
+elevenlabs agents pull [--search "term"] [--dry-run]
 
-# Pull tools from ElevenLabs (pulls from all environments by default)
-elevenlabs tools pull [--search "term"] [--tool "tool-name"] [--env prod] [--dry-run] [--output-dir tool_configs]
+# Pull tools from ElevenLabs
+elevenlabs tools pull [--search "term"] [--tool "tool-name"] [--dry-run] [--output-dir tool_configs]
 
-# Import tests from ElevenLabs (pulls from all environments by default)
-elevenlabs tests pull [--output-dir test_configs] [--env prod] [--dry-run]
+# Import tests from ElevenLabs
+elevenlabs tests pull [--output-dir test_configs] [--dry-run]
 
 # Create and run test
-elevenlabs tests add "Test Name" [--template basic-llm] [--env prod]
+elevenlabs tests add "Test Name" [--template basic-llm]
 
 # Run tests
 elevenlabs agents test "Agent Name"
@@ -254,18 +223,12 @@ elevenlabs tools delete <tool_id>
 # Delete all tools
 elevenlabs tools delete --all
 
-# Delete all tools in specific environment
-elevenlabs tools delete --all --env prod
-
 # Delete test locally and from ElevenLabs
 elevenlabs tests delete <test_id>
 
 # Delete all tests
 elevenlabs tests delete --all
 
-# Delete all tests in specific environment
-elevenlabs tests delete --all --env dev
-
 # Add componenents from [ui.elevenlabs.io](https://ui.elevenlabs.io)
 elevenlabs components add "Component Name"
 ```
@@ -371,62 +334,7 @@ elevenlabs agents list
 elevenlabs agents delete agent_123456789
 ```
 
-> **Tip**: When `--env` is not specified, most commands operate across all configured environments.
-
-## Multi-Environment Workflows
-
-**Setup Multiple Environments:**
-
-```bash
-# Initialise project
-elevenlabs agents init
-
-# Login to all environments
-elevenlabs auth login --env dev
-elevenlabs auth login --env staging
-elevenlabs auth login --env prod
-
-# Verify all environments
-elevenlabs auth whoami
-```
-
-**Develop and Promote Agents:**
-
-```bash
-# Create agent in dev environment
-elevenlabs agents add "My Agent" --template assistant --env dev
-
-# Edit and test in dev
-# Edit agent_configs/my_agent.json
-elevenlabs agents push --env dev
-
-# Pull to promote to staging
-elevenlabs agents pull --env dev
-# Update env field in agents.json from "dev" to "staging"
-elevenlabs agents push --env staging
-
-# Promote to production
-# Update env field to "prod"
-elevenlabs agents push --env prod
-```
-
-**Environment-Specific Operations:**
-
-```bash
-# Push only dev agents
-elevenlabs agents push --env dev
-
-# Pull only prod agents
-elevenlabs agents pull --env prod
-
-# Delete all dev tools
-elevenlabs tools delete --all --env dev
-
-# Pull tests from staging
-elevenlabs tests pull --env staging
-```
-
-**Cross-Environment Management:**
+## Workflow Examples
 
 ```bash
 # List all agents across all environments
diff --git a/src/__tests__/cli.e2e.test.ts b/src/__tests__/cli.e2e.test.ts
index 41a4001..042a810 100644
--- a/src/__tests__/cli.e2e.test.ts
+++ b/src/__tests__/cli.e2e.test.ts
@@ -288,12 +288,12 @@ describe("CLI End-to-End Tests", () => {
     });
 
     it("should handle invalid arguments", async () => {
-      const result = await runCli(["agents", "add"]); // missing required argument
+      const result = await runCli(["agents", "add", "test-agent", "--invalid-flag"]); // invalid flag
 
       expect(result.exitCode).toBe(1);
       // Check both stdout and stderr for the error message
       const output = result.stdout + result.stderr;
-      expect(output).toContain("missing required argument");
+      expect(output).toContain("unknown option");
     });
   });
 
@@ -348,10 +348,8 @@ describe("CLI End-to-End Tests", () => {
       expect(result.stderr).toContain("tools.json not found");
     });
 
-    it("should handle specific tool name option", async () => {
-      // Note: tools push doesn't support --tool option, only --env
-      // This test verifies the command works with --env filter
-      const result = await runCli(["tools", "push", "--env", "test"]);
+    it("should handle tools push command", async () => {
+      const result = await runCli(["tools", "push"]);
 
       // Should succeed (no tools to push is valid)
       expect(result.exitCode).toBe(0);
@@ -2517,308 +2515,4 @@ describe("CLI End-to-End Tests", () => {
     });
   });
 
-  describeIfApiKey("[integration write] multi-environment workflow", () => {
-    let multiEnvTempDir: string;
-    const hasTestApiKey = !!process.env.ELEVENLABS_TEST_API_KEY;
-    
-    // Skip this test suite if TEST API key is not provided
-    const testFn = hasTestApiKey ? it : it.skip;
-
-    beforeAll(async () => {
-      if (!hasTestApiKey) {
-        console.log("Skipping multi-environment tests: ELEVENLABS_TEST_API_KEY not found");
-        console.log("   To run these tests, add ELEVENLABS_TEST_API_KEY to your .env file");
-        return;
-      }
-
-      // One-time cleanup for both environments
-      console.log("One-time cleanup: Removing all remote agents from both environments...");
-      
-      const cleanupTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-e2e-multienv-cleanup-"));
-      
-      try {
-        // Initialize project
-        await runCli(["agents", "init", "--no-ui"], {
-          cwd: cleanupTempDir,
-          includeApiKey: true,
-        });
-
-        // Cleanup prod environment
-        const prodApiKey = process.env.ELEVENLABS_API_KEY!;
-        await runCli(["auth", "login", "--no-ui", "--env", "prod"], {
-          cwd: cleanupTempDir,
-          input: `${prodApiKey}\n`,
-          includeApiKey: true,
-        });
-
-        await runCli(["agents", "pull", "--all", "--no-ui", "--env", "prod"], {
-          cwd: cleanupTempDir,
-          includeApiKey: true,
-          input: "y\n",
-        });
-
-        try {
-          await runCli(["agents", "delete", "--all", "--no-ui", "--env", "prod"], {
-            cwd: cleanupTempDir,
-            includeApiKey: true,
-            input: "y\n",
-          });
-          console.log("✓ Cleaned up prod environment");
-        } catch (error) {
-          console.warn(`Failed to delete prod agents: ${error}`);
-        }
-
-        // Cleanup test environment
-        const testApiKey = process.env.ELEVENLABS_TEST_API_KEY!;
-        await runCli(["auth", "login", "--no-ui", "--env", "test"], {
-          cwd: cleanupTempDir,
-          input: `${testApiKey}\n`,
-          includeApiKey: true,
-        });
-
-        await runCli(["agents", "pull", "--all", "--no-ui", "--env", "test"], {
-          cwd: cleanupTempDir,
-          includeApiKey: true,
-          input: "y\n",
-        });
-
-        try {
-          await runCli(["agents", "delete", "--all", "--no-ui", "--env", "test"], {
-            cwd: cleanupTempDir,
-            includeApiKey: true,
-            input: "y\n",
-          });
-          console.log("✓ Cleaned up test environment");
-        } catch (error) {
-          console.warn(`Failed to delete test agents: ${error}`);
-        }
-      } finally {
-        await fs.remove(cleanupTempDir);
-      }
-    });
-
-    beforeEach(async () => {
-      multiEnvTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-e2e-multienv-"));
-    });
-
-    afterEach(async () => {
-      await fs.remove(multiEnvTempDir);
-    });
-
-    testFn("should handle complete multi-environment workflow", async () => {
-      const prodApiKey = process.env.ELEVENLABS_API_KEY!;
-      const testApiKey = process.env.ELEVENLABS_TEST_API_KEY!;
-
-      // Step 1: Initialize project
-      console.log("Step 1: Initializing project...");
-      const initResult = await runCli(["agents", "init", "--no-ui"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-      });
-      expect(initResult.exitCode).toBe(0);
-
-      // Step 2: Login to prod environment
-      console.log("Step 2: Login to prod environment...");
-      const loginProdResult = await runCli(["login", "--no-ui", "--env", "prod"], {
-        cwd: multiEnvTempDir,
-        input: `${prodApiKey}\n`,
-        includeApiKey: true,
-      });
-      expect(loginProdResult.exitCode).toBe(0);
-
-      // Step 3: Login to test environment
-      console.log("Step 3: Login to test environment...");
-      const loginTestResult = await runCli(["login", "--no-ui", "--env", "test"], {
-        cwd: multiEnvTempDir,
-        input: `${testApiKey}\n`,
-        includeApiKey: true,
-      });
-      expect(loginTestResult.exitCode).toBe(0);
-
-      // Verify both environments are logged in
-      // Don't include API key env var so whoami reads from stored keys
-      const whoamiResult = await runCli(["auth", "whoami", "--no-ui"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: false,
-      });
-      expect(whoamiResult.exitCode).toBe(0);
-      expect(whoamiResult.stdout).toContain("prod");
-      expect(whoamiResult.stdout).toContain("test");
-
-      // Step 4: Add agent to prod (default)
-      console.log("Step 4: Adding agent to prod environment...");
-      const addProdResult = await runCli(["agents", "add", "prod-agent", "--no-ui"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-      });
-      expect(addProdResult.exitCode).toBe(0);
-
-      // Step 5: Add agent to test environment
-      console.log("Step 5: Adding agent to test environment...");
-      const addTestResult = await runCli(["agents", "add", "test-agent", "--no-ui", "--env", "test"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-      });
-      expect(addTestResult.exitCode).toBe(0);
-
-      // Verify both agents exist in agents.json with correct environments
-      let agentsJsonPath = path.join(multiEnvTempDir, "agents.json");
-      let agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(2);
-      
-      const prodAgent = agentsConfig.agents.find((a: AgentConfigEntry) => (a.env || 'prod') === 'prod');
-      const testAgent = agentsConfig.agents.find((a: AgentConfigEntry) => a.env === 'test');
-      expect(prodAgent).toBeTruthy();
-      expect(testAgent).toBeTruthy();
-      
-      const prodAgentId = prodAgent.id;
-      const testAgentId = testAgent.id;
-      console.log(`✓ Created prod agent (${prodAgentId}) and test agent (${testAgentId})`);
-
-      // Step 6: Delete local files
-      console.log("Step 6: Deleting local files...");
-      await fs.remove(agentsJsonPath);
-      await fs.remove(path.join(multiEnvTempDir, "agent_configs"));
-
-      // Step 7: Pull from test environment only
-      console.log("Step 7: Pulling from test environment...");
-      const pullTestResult = await runCli(["agents", "pull", "--all", "--no-ui", "--env", "test"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-        input: "y\n",
-      });
-      if (pullTestResult.exitCode !== 0) {
-        console.log("Pull stderr:", pullTestResult.stderr);
-        console.log("Pull stdout:", pullTestResult.stdout);
-      }
-      expect(pullTestResult.exitCode).toBe(0);
-
-      // Step 8: Check that only one agent was pulled (test agent)
-      console.log("Step 8: Verifying only test agent was pulled...");
-      agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(1);
-      expect(agentsConfig.agents[0].env).toBe("test");
-      expect(agentsConfig.agents[0].id).toBe(testAgentId);
-      console.log("✓ Only test agent was pulled");
-
-      // Step 9: Pull from prod environment
-      console.log("Step 9: Pulling from prod environment...");
-      const pullProdResult = await runCli(["agents", "pull", "--all", "--no-ui", "--env", "prod"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-        input: "y\n",
-      });
-      expect(pullProdResult.exitCode).toBe(0);
-
-      // Step 10: Check both agents exist
-      console.log("Step 10: Verifying both agents exist...");
-      agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(2);
-      
-      const pulledProdAgent = agentsConfig.agents.find((a: AgentConfigEntry) => a.id === prodAgentId);
-      const pulledTestAgent = agentsConfig.agents.find((a: AgentConfigEntry) => a.id === testAgentId);
-      expect(pulledProdAgent).toBeTruthy();
-      expect(pulledTestAgent).toBeTruthy();
-      expect(pulledProdAgent.env || 'prod').toBe('prod');
-      expect(pulledTestAgent.env).toBe('test');
-      console.log("✓ Both agents exist with correct environments");
-
-      // Step 11: Modify both agents
-      console.log("Step 11: Modifying both agents...");
-      const prodConfigPath = path.join(multiEnvTempDir, pulledProdAgent.config);
-      const testConfigPath = path.join(multiEnvTempDir, pulledTestAgent.config);
-      
-      const prodConfig = JSON.parse(await fs.readFile(prodConfigPath, "utf-8"));
-      const testConfig = JSON.parse(await fs.readFile(testConfigPath, "utf-8"));
-      
-      prodConfig.name = "modified-prod-agent";
-      testConfig.name = "modified-test-agent";
-      
-      await fs.writeFile(prodConfigPath, JSON.stringify(prodConfig, null, 2));
-      await fs.writeFile(testConfigPath, JSON.stringify(testConfig, null, 2));
-      console.log("✓ Modified both agents");
-
-      // Step 12: Push changes
-      console.log("Step 12: Pushing changes...");
-      const pushResult = await runCli(["agents", "push", "--no-ui"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-      });
-      expect(pushResult.exitCode).toBe(0);
-      console.log("✓ Pushed changes");
-
-      // Step 13: Remove local files again
-      console.log("Step 13: Removing local files...");
-      await fs.remove(agentsJsonPath);
-      await fs.remove(path.join(multiEnvTempDir, "agent_configs"));
-
-      // Step 14: Pull from test environment
-      console.log("Step 14: Pulling from test environment...");
-      await runCli(["agents", "pull", "--all", "--no-ui", "--env", "test"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-        input: "y\n",
-      });
-
-      // Step 15: Confirm test agent was modified
-      console.log("Step 15: Verifying test agent was modified...");
-      agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(1);
-      const modifiedTestConfig = JSON.parse(
-        await fs.readFile(path.join(multiEnvTempDir, agentsConfig.agents[0].config), "utf-8")
-      );
-      expect(modifiedTestConfig.name).toBe("modified-test-agent");
-      console.log("✓ Test agent was modified");
-
-      // Step 16: Pull from prod environment
-      console.log("Step 16: Pulling from prod environment...");
-      await runCli(["agents", "pull", "--all", "--no-ui", "--env", "prod"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-        input: "y\n",
-      });
-
-      // Step 17: Confirm prod agent was modified
-      console.log("Step 17: Verifying prod agent was modified...");
-      agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(2);
-      const modifiedProdAgent = agentsConfig.agents.find((a: AgentConfigEntry) => a.id === prodAgentId);
-      const modifiedProdConfig = JSON.parse(
-        await fs.readFile(path.join(multiEnvTempDir, modifiedProdAgent.config), "utf-8")
-      );
-      expect(modifiedProdConfig.name).toBe("modified-prod-agent");
-      console.log("✓ Prod agent was modified");
-
-      // Step 18: Delete all agents
-      console.log("Step 18: Deleting all agents...");
-      const deleteAllResult = await runCli(["agents", "delete", "--all", "--no-ui"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-        input: "y\n",
-      });
-      expect(deleteAllResult.exitCode).toBe(0);
-
-      // Verify agents.json is empty
-      agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(0);
-      console.log("✓ All agents deleted");
-
-      // Step 19: Pull from both environments
-      console.log("Step 19: Pulling from both environments...");
-      const finalPullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
-        cwd: multiEnvTempDir,
-        includeApiKey: true,
-        input: "y\n",
-      });
-      expect(finalPullResult.exitCode).toBe(0);
-
-      // Step 20: Confirm nothing was pulled
-      console.log("Step 20: Verifying nothing was pulled...");
-      agentsConfig = JSON.parse(await fs.readFile(agentsJsonPath, "utf-8"));
-      expect(agentsConfig.agents).toHaveLength(0);
-      console.log("✓ No agents pulled (both environments empty)");
-
-      console.log("✓ Multi-environment workflow test completed successfully");
-    });
-  });
 });
diff --git a/src/__tests__/residency.test.ts b/src/__tests__/residency.test.ts
index 63ad01f..e97ba15 100644
--- a/src/__tests__/residency.test.ts
+++ b/src/__tests__/residency.test.ts
@@ -147,7 +147,7 @@ describe("Residency-specific API Client", () => {
     mockedOs.homedir.mockReturnValue(tempDir);
 
     await expect(getElevenLabsClient()).rejects.toThrow(
-      "No API key found for environment 'prod'. Use 'elevenlabs auth login --env prod' to authenticate or set ELEVENLABS_API_KEY environment variable."
+      "No API key found for environment 'prod'. Use 'elevenlabs auth login' to authenticate or set ELEVENLABS_API_KEY environment variable."
     );
   });
 });
diff --git a/src/agents/commands/add.ts b/src/agents/commands/add.ts
index bb39e95..8486c7e 100644
--- a/src/agents/commands/add.ts
+++ b/src/agents/commands/add.ts
@@ -14,20 +14,17 @@ interface AgentsConfig {
   agents: Array<{
     config: string;
     id?: string;
-    env?: string;
   }>;
 }
 
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AddOptions {
   configPath?: string;
   template?: string;
-  env: string;
 }
 
 export function createAddCommand(): Command {
@@ -36,7 +33,6 @@ export function createAddCommand(): Command {
     .argument('[name]', 'Name of the agent to create')
     .option('--config-path <path>', 'Custom config path (optional)')
     .option('--template <template>', 'Template type to use')
-    .option('--env <environment>', 'Environment to create agent in', 'prod')
     .option('--no-ui', 'Disable interactive UI')
     .action(async (name: string | undefined, options: AddOptions & { ui: boolean }) => {
       try {
@@ -45,8 +41,7 @@ export function createAddCommand(): Command {
           const { waitUntilExit } = render(
             React.createElement(AddAgentView, {
               initialName: name,
-              template: options.template,
-              environment: options.env || 'prod'
+              template: options.template
             })
           );
           await waitUntilExit();
@@ -79,7 +74,7 @@ export function createAddCommand(): Command {
         }
 
         // Create agent in ElevenLabs first to get ID
-        const environment = options.env || 'prod';
+        const environment = 'prod';
         console.log(`Creating agent '${name}' in ElevenLabs (environment: ${environment})...`);
 
         const client = await getElevenLabsClient(environment);
@@ -116,8 +111,7 @@ export function createAddCommand(): Command {
         // Store agent ID in index file
         const newAgent: AgentDefinition = {
           config: configPath,
-          id: agentId,
-          env: environment
+          id: agentId
         };
         agentsConfig.agents.push(newAgent);
 
diff --git a/src/agents/commands/delete-impl.ts b/src/agents/commands/delete-impl.ts
index 9454c68..b8d9bb7 100644
--- a/src/agents/commands/delete-impl.ts
+++ b/src/agents/commands/delete-impl.ts
@@ -9,7 +9,6 @@ const AGENTS_CONFIG_FILE = "agents.json";
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AgentsConfig {
@@ -35,9 +34,9 @@ export async function deleteAgent(agentId: string): Promise<void> {
   const agentDef = agentsConfig.agents[agentIndex];
   const agentName = await getAgentName(agentDef.config);
   const configPath = agentDef.config;
-  const environment = agentDef.env || 'prod';
+  const environment = 'prod';
 
-  console.log(`Deleting agent '${agentName}' (ID: ${agentId}) [${environment}]...`);
+  console.log(`Deleting agent '${agentName}' (ID: ${agentId})...`);
 
   // Delete from ElevenLabs (globally)
   console.log('Deleting from ElevenLabs...');
@@ -65,7 +64,7 @@ export async function deleteAgent(agentId: string): Promise<void> {
   console.log(`\n✓ Successfully deleted agent '${agentName}'`);
 }
 
-export async function deleteAllAgents(ui: boolean = true, env?: string): Promise<void> {
+export async function deleteAllAgents(ui: boolean = true): Promise<void> {
   // Load agents configuration
   const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
   if (!(await fs.pathExists(agentsConfigPath))) {
@@ -79,32 +78,19 @@ export async function deleteAllAgents(ui: boolean = true, env?: string): Promise
     return;
   }
 
-  // Filter agents by environment if specified
-  const agentsToDelete = env
-    ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === env)
-    : agentsConfig.agents;
-
-  if (agentsToDelete.length === 0) {
-    console.log(env ? `No agents found in environment '${env}'` : 'No agents found to delete');
-    return;
-  }
+  const agentsToDelete = agentsConfig.agents;
 
   // Show what will be deleted
-  const envInfo = env ? ` in environment '${env}'` : '';
-  console.log(`\nFound ${agentsToDelete.length} agent(s) to delete${envInfo}:`);
+  console.log(`\nFound ${agentsToDelete.length} agent(s) to delete:`);
   for (let i = 0; i < agentsToDelete.length; i++) {
     const agent = agentsToDelete[i];
     const agentName = await getAgentName(agent.config);
-    const agentEnv = agent.env || 'prod';
-    console.log(`  ${i + 1}. ${agentName} (${agent.id}) [${agentEnv}]`);
+    console.log(`  ${i + 1}. ${agentName} (${agent.id})`);
   }
 
   // Confirm deletion (skip if --no-ui)
   if (ui) {
-    const warningMsg = env
-      ? `\nWARNING: This will delete ${agentsToDelete.length} agent(s) from environment '${env}' in both local configuration and ElevenLabs.`
-      : '\nWARNING: This will delete ALL agents from both local configuration and ElevenLabs.';
-    console.log(warningMsg);
+    console.log('\nWARNING: This will delete ALL agents from both local configuration and ElevenLabs.');
     const confirmed = await promptForConfirmation('Are you sure you want to delete these agents?');
 
     if (!confirmed) {
@@ -123,8 +109,8 @@ export async function deleteAllAgents(ui: boolean = true, env?: string): Promise
   for (const agentDef of agentsToDelete) {
     try {
       const agentName = await getAgentName(agentDef.config);
-      const environment = agentDef.env || 'prod';
-      console.log(`Deleting '${agentName}' (${agentDef.id}) [${environment}]...`);
+      const environment = 'prod';
+      console.log(`Deleting '${agentName}' (${agentDef.id})...`);
 
       // Delete from ElevenLabs
       if (agentDef.id) {
diff --git a/src/agents/commands/delete.ts b/src/agents/commands/delete.ts
index d08086d..f05948e 100644
--- a/src/agents/commands/delete.ts
+++ b/src/agents/commands/delete.ts
@@ -8,9 +8,8 @@ export function createDeleteCommand(): Command {
     .description('Delete an agent locally and from ElevenLabs')
     .argument('[agent_id]', 'ID of the agent to delete (omit with --all to delete all agents)')
     .option('--all', 'Delete all agents', false)
-    .option('--env <environment>', 'Filter agents by environment (use with --all)')
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (agentId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
+    .action(async (agentId: string | undefined, options: { all: boolean; ui: boolean }) => {
       try {
         if (options.all && agentId) {
           console.error('Error: Cannot specify both agent_id and --all flag');
@@ -22,13 +21,8 @@ export function createDeleteCommand(): Command {
           process.exit(1);
         }
 
-        if (options.env && !options.all) {
-          console.error('Error: --env flag can only be used with --all');
-          process.exit(1);
-        }
-
         if (options.all) {
-          await deleteAllAgents(options.ui, options.env);
+          await deleteAllAgents(options.ui);
         } else {
           await deleteAgent(agentId!);
         }
diff --git a/src/agents/commands/init.ts b/src/agents/commands/init.ts
index c23b97a..24feb01 100644
--- a/src/agents/commands/init.ts
+++ b/src/agents/commands/init.ts
@@ -15,7 +15,6 @@ interface AgentsConfig {
   agents: Array<{
     config: string;
     id?: string;
-    env?: string;
   }>;
 }
 
@@ -23,7 +22,6 @@ interface TestsConfig {
   tests: Array<{
     config: string;
     id?: string;
-    env?: string;
   }>;
 }
 
diff --git a/src/agents/commands/pull-impl.ts b/src/agents/commands/pull-impl.ts
index 558b5ee..ef0b07b 100644
--- a/src/agents/commands/pull-impl.ts
+++ b/src/agents/commands/pull-impl.ts
@@ -11,7 +11,6 @@ const AGENTS_CONFIG_FILE = "agents.json";
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AgentsConfig {
@@ -24,34 +23,15 @@ interface PullOptions {
   dryRun: boolean;
   update?: boolean;
   all?: boolean;
-  env?: string;
 }
 
 export async function pullAgents(options: PullOptions): Promise<void> {
   const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  const environment = 'prod';
 
-  // Determine which environments to pull from
-  const environmentsToPull: string[] = options.env
-    ? [options.env]
-    : await listEnvironments();
+  console.log(`Pulling from environment: ${environment}`);
 
-  if (environmentsToPull.length === 0) {
-    console.log('No environments configured. Use "elevenlabs auth login" to add an environment.');
-    return;
-  }
-
-  if (!options.env) {
-    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
-  }
-
-  // Pull from each environment
-  for (const environment of environmentsToPull) {
-    console.log(`\n${'='.repeat(50)}`);
-    console.log(`Environment: ${environment}`);
-    console.log('='.repeat(50));
-
-    await pullAgentsFromEnvironment(options, environment, agentsConfigPath);
-  }
+  await pullAgentsFromEnvironment(options, environment, agentsConfigPath);
 }
 
 async function pullAgentsFromEnvironment(options: PullOptions, environment: string, agentsConfigPath: string): Promise<void> {
@@ -99,10 +79,9 @@ async function pullAgentsFromEnvironment(options: PullOptions, environment: stri
     console.log(`Found ${agentsList.length} agent(s)`);
   }
 
-  // Build map of existing agents by ID for this environment
+  // Build map of existing agents by ID
   const existingAgentIds = new Map(
     agentsConfig.agents
-      .filter(agent => (agent.env || 'prod') === environment)
       .map(agent => [agent.id, agent])
   );
 
@@ -228,8 +207,7 @@ async function pullAgentsFromEnvironment(options: PullOptions, environment: stri
 
         const newAgent: AgentDefinition = {
           config: configPath,
-          id: agent.id,
-          env: environment
+          id: agent.id
         };
 
         agentsConfig.agents.push(newAgent);
diff --git a/src/agents/commands/pull.ts b/src/agents/commands/pull.ts
index bbe2f0f..a92e2dc 100644
--- a/src/agents/commands/pull.ts
+++ b/src/agents/commands/pull.ts
@@ -10,7 +10,6 @@ interface PullOptions {
   dryRun: boolean;
   update?: boolean;
   all?: boolean;
-  env?: string;
 }
 
 export function createPullCommand(): Command {
@@ -21,13 +20,12 @@ export function createPullCommand(): Command {
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--update', 'Update existing items only, skip new')
     .option('--all', 'Pull all (new + existing)')
-    .option('--env <environment>', 'Environment to pull from (defaults to all)')
     .option('--no-ui', 'Disable interactive UI')
     .action(async (options: PullOptions & { ui: boolean }) => {
       try {
         if (options.ui !== false) {
           // Use Ink UI for pull
-          const environments = options.env ? [options.env] : ['prod']; // Default to prod if no env specified
+          const environments = ['prod'];
           const { waitUntilExit } = render(
             React.createElement(PullView, {
               agent: options.agent,
diff --git a/src/agents/commands/push-impl.ts b/src/agents/commands/push-impl.ts
index 43485e6..0f3f26d 100644
--- a/src/agents/commands/push-impl.ts
+++ b/src/agents/commands/push-impl.ts
@@ -9,14 +9,13 @@ const AGENTS_CONFIG_FILE = "agents.json";
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AgentsConfig {
   agents: AgentDefinition[];
 }
 
-export async function pushAgents(dryRun: boolean = false, environment?: string): Promise<void> {
+export async function pushAgents(dryRun: boolean = false): Promise<void> {
   // Load agents configuration
   const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
   if (!(await fs.pathExists(agentsConfigPath))) {
@@ -25,26 +24,15 @@ export async function pushAgents(dryRun: boolean = false, environment?: string):
 
   const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
 
-  // Filter agents by environment if specified
-  const agentsToProcess = environment
-    ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === environment)
-    : agentsConfig.agents;
+  const agentsToProcess = agentsConfig.agents;
+  const environment = 'prod';
 
-  if (environment && agentsToProcess.length === 0) {
-    console.log(`No agents found for environment '${environment}'`);
-    return;
-  }
-
-  if (!environment) {
-    const envs = [...new Set(agentsToProcess.map(a => a.env || 'prod'))];
-    console.log(`Pushing ${agentsToProcess.length} agent(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
-  }
+  console.log(`Pushing ${agentsToProcess.length} agent(s) to environment: ${environment}`);
 
   let changesMade = false;
 
   for (const agentDef of agentsToProcess) {
     const configPath = agentDef.config;
-    const environment = agentDef.env || 'prod';
 
     if (!configPath) {
       console.log(`Warning: No config path found for agent`);
diff --git a/src/agents/commands/push.ts b/src/agents/commands/push.ts
index be18467..0d95707 100644
--- a/src/agents/commands/push.ts
+++ b/src/agents/commands/push.ts
@@ -14,7 +14,6 @@ interface AgentsConfig {
   agents: Array<{
     config: string;
     id?: string;
-    env?: string;
   }>;
 }
 
@@ -25,10 +24,9 @@ interface PushOptions {
 export function createPushCommand(): Command {
   return new Command('push')
     .description('Push agents to ElevenLabs API when configs change')
-    .option('--env <environment>', 'Filter agents by environment (defaults to all environments)')
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: PushOptions & { ui: boolean; env?: string }) => {
+    .action(async (options: PushOptions & { ui: boolean }) => {
       try {
         if (options.ui !== false) {
           // Use new Ink UI for push
@@ -39,15 +37,7 @@ export function createPushCommand(): Command {
 
           const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
 
-          // Filter agents by environment if specified
-          const agentsToProcess = options.env
-            ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === options.env)
-            : agentsConfig.agents;
-
-          if (options.env && agentsToProcess.length === 0) {
-            console.log(`No agents found for environment '${options.env}'`);
-            return;
-          }
+          const agentsToProcess = agentsConfig.agents;
 
           // Prepare agents for UI
           const pushAgentsData = await Promise.all(
@@ -55,8 +45,7 @@ export function createPushCommand(): Command {
               name: await getAgentName(agent.config),
               configPath: agent.config,
               status: 'pending' as const,
-              agentId: agent.id,
-              env: agent.env || 'prod'
+              agentId: agent.id
             }))
           );
 
@@ -69,7 +58,7 @@ export function createPushCommand(): Command {
           await waitUntilExit();
         } else {
           // Use existing non-UI push
-          await pushAgents(options.dryRun, options.env);
+          await pushAgents(options.dryRun);
         }
       } catch (error) {
         console.error(`Error during push: ${error}`);
diff --git a/src/agents/commands/status-impl.ts b/src/agents/commands/status-impl.ts
index 714c455..7850779 100644
--- a/src/agents/commands/status-impl.ts
+++ b/src/agents/commands/status-impl.ts
@@ -9,7 +9,6 @@ const AGENTS_CONFIG_FILE = "agents.json";
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AgentsConfig {
diff --git a/src/agents/commands/test-impl.ts b/src/agents/commands/test-impl.ts
index 9d76548..481814a 100644
--- a/src/agents/commands/test-impl.ts
+++ b/src/agents/commands/test-impl.ts
@@ -10,7 +10,6 @@ const AGENTS_CONFIG_FILE = "agents.json";
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AgentsConfig {
@@ -50,7 +49,7 @@ export async function runAgentTests(agentId: string): Promise<void> {
   const testIds = attachedTests.map(test => test.test_id);
 
   // Get agent environment
-  const environment = agentDef.env || 'prod';
+  const environment = 'prod';
 
   console.log(`Running ${testIds.length} test(s) for agent '${agentName}' [${environment}]...`);
   console.log('');
diff --git a/src/agents/commands/utils.ts b/src/agents/commands/utils.ts
index b733213..75a65d6 100644
--- a/src/agents/commands/utils.ts
+++ b/src/agents/commands/utils.ts
@@ -8,7 +8,6 @@ interface AgentsConfig {
   agents: Array<{
     config: string;
     id?: string;
-    env?: string;
   }>;
 }
 
@@ -44,9 +43,8 @@ export async function listConfiguredAgents(): Promise<void> {
   for (let i = 0; i < agentsConfig.agents.length; i++) {
     const agentDef = agentsConfig.agents[i];
     const agentName = await getAgentName(agentDef.config);
-    const environment = agentDef.env || 'prod';
     const agentId = agentDef.id || 'No ID';
-    console.log(`${i + 1}. ${agentName} [${environment}]`);
+    console.log(`${i + 1}. ${agentName}`);
     console.log(`   ID: ${agentId}`);
     const configPath = agentDef.config || 'No config path';
     console.log(`   Config: ${configPath}`);
diff --git a/src/agents/commands/widget-impl.ts b/src/agents/commands/widget-impl.ts
index 6041306..e207fb0 100644
--- a/src/agents/commands/widget-impl.ts
+++ b/src/agents/commands/widget-impl.ts
@@ -9,7 +9,6 @@ const AGENTS_CONFIG_FILE = "agents.json";
 interface AgentDefinition {
   config: string;
   id?: string;
-  env?: string;
 }
 
 interface AgentsConfig {
diff --git a/src/agents/ui/AddAgentView.tsx b/src/agents/ui/AddAgentView.tsx
index 17643a1..07fb045 100644
--- a/src/agents/ui/AddAgentView.tsx
+++ b/src/agents/ui/AddAgentView.tsx
@@ -15,7 +15,6 @@ import fs from 'fs-extra';
 interface AddAgentViewProps {
   initialName?: string;
   template?: string;
-  environment?: string;
   onComplete?: () => void;
 }
 
@@ -24,7 +23,6 @@ type Step = 'name' | 'template' | 'confirm' | 'creating';
 export const AddAgentView: React.FC<AddAgentViewProps> = ({
   initialName,
   template,
-  environment = 'prod',
   onComplete
 }) => {
   const { exit } = useApp();
@@ -69,8 +67,8 @@ export const AddAgentView: React.FC<AddAgentViewProps> = ({
       const agentConfig = getTemplateByName(agentName, selectedTemplate);
       
       // Step 2: Upload to ElevenLabs first to get ID
-      setStatusMessage(`Creating agent in ElevenLabs (${environment})...`);
-      const client = await getElevenLabsClient(environment);
+      setStatusMessage('Creating agent in ElevenLabs...');
+      const client = await getElevenLabsClient('prod');
       const conversationConfig = agentConfig.conversation_config || {};
       const platformSettings = agentConfig.platform_settings;
       const tags = agentConfig.tags || [];
@@ -107,8 +105,7 @@ export const AddAgentView: React.FC<AddAgentViewProps> = ({
       // Add new agent with ID
       agentsConfig.agents.push({
         config: relativeConfigPath,
-        id: agentId,
-        env: environment
+        id: agentId
       });
       
       await fs.writeJson(agentsConfigPath, agentsConfig, { spaces: 2 });
diff --git a/src/agents/ui/AgentsHelpView.tsx b/src/agents/ui/AgentsHelpView.tsx
index 8fec2eb..f2e3403 100644
--- a/src/agents/ui/AgentsHelpView.tsx
+++ b/src/agents/ui/AgentsHelpView.tsx
@@ -24,7 +24,6 @@ const commands: Command[] = [
     options: [
       { flag: "--config-path <path>", description: "Custom config path" },
       { flag: "--template <template>", description: "Template type to use (default: 'default')" },
-      { flag: "--env <environment>", description: "Environment to create agent in (default: 'prod')" },
     ],
   },
   {
diff --git a/src/agents/ui/ListAgentsView.tsx b/src/agents/ui/ListAgentsView.tsx
index dfb4881..8d3b2fc 100644
--- a/src/agents/ui/ListAgentsView.tsx
+++ b/src/agents/ui/ListAgentsView.tsx
@@ -11,7 +11,6 @@ interface Agent {
   name: string;
   config: string;
   id?: string;
-  env: string;
 }
 
 interface ListAgentsViewProps {
@@ -35,7 +34,7 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
           return;
         }
 
-        const agentsConfig = await readConfig<{ agents: { config: string; id?: string; env?: string }[] }>(agentsConfigPath);
+        const agentsConfig = await readConfig<{ agents: { config: string; id?: string }[] }>(agentsConfigPath);
         
         // Read names from individual config files
         const agentsWithNames = await Promise.all(
@@ -52,8 +51,7 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
             return {
               name,
               config: agentDef.config,
-              id: agentDef.id,
-              env: agentDef.env || 'prod'
+              id: agentDef.id
             };
           })
         );
@@ -83,7 +81,6 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
   // Map agents to rows
   const agentRows = agents.map(agent => ({
     name: agent.name,
-    env: agent.env,
     id: agent.id || 'N/A',
     configPath: agent.config
   }));
@@ -138,28 +135,22 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
                 <Box width={30}>
                   <Text color={theme.colors.text.muted} bold>NAME</Text>
                 </Box>
-                <Box width={10}>
-                  <Text color={theme.colors.text.muted} bold>ENV</Text>
-                </Box>
                 <Box>
                   <Text color={theme.colors.text.muted} bold>CONFIG PATH</Text>
                 </Box>
               </Box>
-              
+
               {/* Separator */}
               <Box marginY={0}>
                 <Text color={theme.colors.text.muted}>{'─'.repeat(80)}</Text>
               </Box>
-              
+
               {/* Table Rows */}
               {agentRows.map((row, index) => (
                 <Box key={index}>
                   <Box width={30}>
                     <Text color={theme.colors.text.primary}>{row.name}</Text>
                   </Box>
-                  <Box width={10}>
-                    <Text color={theme.colors.accent.secondary}>{row.env}</Text>
-                  </Box>
                   <Box>
                     <Text color={theme.colors.text.muted}>{row.configPath}</Text>
                   </Box>
diff --git a/src/agents/ui/PullView.tsx b/src/agents/ui/PullView.tsx
index 09c95ca..f4ce25e 100644
--- a/src/agents/ui/PullView.tsx
+++ b/src/agents/ui/PullView.tsx
@@ -10,7 +10,6 @@ import { getElevenLabsClient, listAgentsApi, getAgentApi } from '../../shared/el
 interface PullAgent {
   name: string;
   agentId: string;
-  env: string;
   status: 'pending' | 'checking' | 'pulling' | 'completed' | 'error' | 'skipped';
   action?: 'create' | 'update' | 'skip';
   message?: string;
@@ -80,10 +79,9 @@ export const PullView: React.FC<PullViewProps> = ({
 
           if (agentsList.length === 0) continue;
 
-          // Build ID-based map for existing agents in this environment
+          // Build ID-based map for existing agents
           const existingAgentIds = new Map<string, any>(
             agentsConfig.agents
-              .filter((a: any) => (a.env || 'prod') === environment)
               .map((agent: any) => [agent.id as string, agent])
           );
 
@@ -126,7 +124,6 @@ export const PullView: React.FC<PullViewProps> = ({
             allAgentsToPull.push({
               name: agentName,
               agentId,
-              env: environment,
               action,
               status,
               message: status === 'skipped' ? 'Skipped' : undefined
@@ -196,12 +193,12 @@ export const PullView: React.FC<PullViewProps> = ({
     await new Promise(resolve => setTimeout(resolve, 300));
 
     try {
-      const client = await getElevenLabsClient(agent.env);
+      const client = await getElevenLabsClient('prod');
       const agentName = agent.name;
       
-      // Find existing entry for this agent ID in this environment
-      const existingEntry = agentsConfig.agents.find((a: any) => 
-        a.id === agent.agentId && (a.env || 'prod') === agent.env
+      // Find existing entry for this agent ID
+      const existingEntry = agentsConfig.agents.find((a: any) =>
+        a.id === agent.agentId
       );
 
       if (dryRun) {
@@ -262,8 +259,7 @@ export const PullView: React.FC<PullViewProps> = ({
           // Add to agents config with ID
           agentsConfig.agents.push({
             config: configPath,
-            id: agent.agentId,
-            env: agent.env
+            id: agent.agentId
           });
 
           setAgents(prev => prev.map((a, i) => 
@@ -323,9 +319,6 @@ export const PullView: React.FC<PullViewProps> = ({
                 <Box width={30}>
                   <Text color={theme.colors.text.muted} bold>NAME</Text>
                 </Box>
-                <Box width={10}>
-                  <Text color={theme.colors.text.muted} bold>ENV</Text>
-                </Box>
                 <Box width={20}>
                   <Text color={theme.colors.text.muted} bold>AGENT ID</Text>
                 </Box>
@@ -372,9 +365,6 @@ export const PullView: React.FC<PullViewProps> = ({
                     <Box width={30}>
                       <Text color={theme.colors.text.primary}>{agent.name}</Text>
                     </Box>
-                    <Box width={10}>
-                      <Text color={theme.colors.accent.secondary}>{agent.env}</Text>
-                    </Box>
                     <Box width={20}>
                       <Text color={theme.colors.text.muted}>{agent.agentId.slice(0, 18)}...</Text>
                     </Box>
diff --git a/src/agents/ui/PushView.tsx b/src/agents/ui/PushView.tsx
index 2dfc115..c7c9a78 100644
--- a/src/agents/ui/PushView.tsx
+++ b/src/agents/ui/PushView.tsx
@@ -13,7 +13,6 @@ interface PushAgent {
   status: 'pending' | 'checking' | 'pushing' | 'completed' | 'error' | 'skipped';
   message?: string;
   agentId?: string;
-  env: string;
 }
 
 interface PushViewProps {
@@ -95,7 +94,7 @@ export const PushView: React.FC<PushViewProps> = ({
           );
 
           // Get ElevenLabs client for this agent's environment
-          const client = await getElevenLabsClient(agent.env);
+          const client = await getElevenLabsClient('prod');
 
           // Extract config components
           const conversationConfig = agentConfig.conversation_config || {};
@@ -202,9 +201,6 @@ export const PushView: React.FC<PushViewProps> = ({
             <Box width={30}>
               <Text color={theme.colors.text.muted} bold>NAME</Text>
             </Box>
-            <Box width={10}>
-              <Text color={theme.colors.text.muted} bold>ENV</Text>
-            </Box>
             <Box width={15}>
               <Text color={theme.colors.text.muted} bold>STATUS</Text>
             </Box>
@@ -248,9 +244,6 @@ export const PushView: React.FC<PushViewProps> = ({
                 <Box width={30}>
                   <Text color={theme.colors.text.primary}>{agent.name}</Text>
                 </Box>
-                <Box width={10}>
-                  <Text color={theme.colors.accent.secondary}>{agent.env}</Text>
-                </Box>
                 <Box width={15}>
                   <Text color={statusColor}>{statusText}</Text>
                 </Box>
diff --git a/src/auth/commands/login.ts b/src/auth/commands/login.ts
index 3130eab..299a5e8 100644
--- a/src/auth/commands/login.ts
+++ b/src/auth/commands/login.ts
@@ -10,16 +10,15 @@ import { ElevenLabsClient } from '@elevenlabs/elevenlabs-js';
 export function createLoginCommand(): Command {
   return new Command('login')
     .description('Login with your ElevenLabs API key')
-    .option('--env <environment>', 'Environment name', 'prod')
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { ui: boolean; env: string }) => {
+    .action(async (options: { ui: boolean }) => {
       try {
-        const environment = options.env || 'prod';
+        const environment = 'prod';
 
         if (options.ui !== false) {
           // Use Ink UI for login
           const { waitUntilExit } = render(
-            React.createElement(LoginView, { environment })
+            React.createElement(LoginView, {})
           );
           await waitUntilExit();
         } else {
diff --git a/src/auth/commands/logout.ts b/src/auth/commands/logout.ts
index 3c54ede..eae85f8 100644
--- a/src/auth/commands/logout.ts
+++ b/src/auth/commands/logout.ts
@@ -7,16 +7,15 @@ import { removeApiKey, isLoggedIn } from '../../shared/config.js';
 export function createLogoutCommand(): Command {
   return new Command('logout')
     .description('Logout and remove stored API key')
-    .option('--env <environment>', 'Environment to logout from', 'prod')
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { ui: boolean; env: string }) => {
+    .action(async (options: { ui: boolean }) => {
       try {
-        const environment = options.env || 'prod';
+        const environment = 'prod';
 
         if (options.ui !== false) {
           // Use Ink UI for logout
           const { waitUntilExit } = render(
-            React.createElement(LogoutView, { environment })
+            React.createElement(LogoutView, {})
           );
           await waitUntilExit();
         } else {
diff --git a/src/auth/ui/AuthHelpView.tsx b/src/auth/ui/AuthHelpView.tsx
index 685a6b0..cc73594 100644
--- a/src/auth/ui/AuthHelpView.tsx
+++ b/src/auth/ui/AuthHelpView.tsx
@@ -14,23 +14,14 @@ const commands: Command[] = [
   {
     name: "login",
     description: "Login with your ElevenLabs API key",
-    options: [
-      { flag: "--env <environment>", description: "Environment name (default: 'prod')" },
-    ],
   },
   {
     name: "logout",
     description: "Logout and remove stored API key",
-    options: [
-      { flag: "--env <environment>", description: "Environment to logout from" },
-    ],
   },
   {
     name: "whoami",
     description: "Show current login status",
-    options: [
-      { flag: "--env <environment>", description: "Environment to check" },
-    ],
   },
   {
     name: "residency [location]",
diff --git a/src/auth/ui/LoginView.tsx b/src/auth/ui/LoginView.tsx
index eae816b..dd249a7 100644
--- a/src/auth/ui/LoginView.tsx
+++ b/src/auth/ui/LoginView.tsx
@@ -7,10 +7,9 @@ import { setApiKey } from '../../shared/config.js';
 
 interface LoginViewProps {
   onComplete?: () => void;
-  environment?: string;
 }
 
-export const LoginView: React.FC<LoginViewProps> = ({ onComplete, environment = 'prod' }) => {
+export const LoginView: React.FC<LoginViewProps> = ({ onComplete }) => {
   const { exit } = useApp();
   const [apiKey, setApiKeyInput] = useState('');
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -59,7 +58,7 @@ export const LoginView: React.FC<LoginViewProps> = ({ onComplete, environment =
     setError(null);
 
     try {
-      await setApiKey(apiKey, environment);
+      await setApiKey(apiKey, 'prod');
       setSuccess(true);
       
       setTimeout(() => {
@@ -84,7 +83,7 @@ export const LoginView: React.FC<LoginViewProps> = ({ onComplete, environment =
           <>
             <Box marginBottom={1}>
               <Text color={theme.colors.text.primary}>
-                Enter your ElevenLabs API key for environment: <Text color={theme.colors.accent.primary}>{environment}</Text>
+                Enter your ElevenLabs API key
               </Text>
             </Box>
 
@@ -137,12 +136,12 @@ export const LoginView: React.FC<LoginViewProps> = ({ onComplete, environment =
             <StatusCard
               title="Login Successful"
               status="success"
-              message={`Your API key has been securely stored for environment '${environment}'`}
+              message="Your API key has been securely stored"
             />
-            
+
             <Box marginTop={1}>
               <Text color={theme.colors.success}>
-                ✓ You are now logged in to ElevenLabs ({environment})
+                ✓ You are now logged in to ElevenLabs
               </Text>
             </Box>
           </Box>
diff --git a/src/auth/ui/LogoutView.tsx b/src/auth/ui/LogoutView.tsx
index ea0dd30..2c3fbf7 100644
--- a/src/auth/ui/LogoutView.tsx
+++ b/src/auth/ui/LogoutView.tsx
@@ -7,10 +7,9 @@ import { isLoggedIn, removeApiKey } from '../../shared/config.js';
 
 interface LogoutViewProps {
   onComplete?: () => void;
-  environment?: string;
 }
 
-export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment = 'prod' }) => {
+export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete }) => {
   const { exit } = useApp();
   const [confirming, setConfirming] = useState(true);
   const [processing, setProcessing] = useState(false);
@@ -30,7 +29,7 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
 
   useEffect(() => {
     const checkLoginStatus = async () => {
-      const loggedIn = await isLoggedIn(environment);
+      const loggedIn = await isLoggedIn('prod');
       if (!loggedIn) {
         setNotLoggedIn(true);
         setConfirming(false);
@@ -45,14 +44,14 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
     };
 
     checkLoginStatus();
-  }, [exit, onComplete, environment]);
+  }, [exit, onComplete]);
 
   const handleLogout = async () => {
     setConfirming(false);
     setProcessing(true);
 
     try {
-      await removeApiKey(environment);
+      await removeApiKey('prod');
       setProcessing(false);
       setSuccess(true);
 
@@ -79,7 +78,7 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
             <StatusCard
               title="Not Logged In"
               status="warning"
-              message={`You are not logged in to environment '${environment}'`}
+              message="You are not logged in"
             />
             <Box marginTop={1}>
               <Text color={theme.colors.text.secondary}>
@@ -92,10 +91,10 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
             <StatusCard
               title="Confirm Logout"
               status="warning"
-              message={`Logout from environment '${environment}'?`}
+              message="Logout from ElevenLabs?"
               details={[
-                "This will remove your stored API key for this environment",
-                "You'll need to login again to use the CLI with this environment"
+                "This will remove your stored API key",
+                "You'll need to login again to use the CLI"
               ]}
             />
             
@@ -109,14 +108,14 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
           <StatusCard
             title="Logging Out"
             status="loading"
-            message={`Removing credentials for '${environment}'...`}
+            message="Removing credentials..."
           />
         ) : success ? (
           <>
             <StatusCard
               title="Logout Successful"
               status="success"
-              message={`Logged out from '${environment}'`}
+              message="Logged out successfully"
             />
             
             <Box marginTop={1}>
@@ -127,7 +126,7 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
             
             <Box marginTop={1}>
               <Text color={theme.colors.text.secondary}>
-                Run 'elevenlabs auth login --env {environment}' to authenticate again
+                Run 'elevenlabs auth login' to authenticate again
               </Text>
             </Box>
           </>
diff --git a/src/auth/ui/WhoamiView.tsx b/src/auth/ui/WhoamiView.tsx
index 49b0926..1a45021 100644
--- a/src/auth/ui/WhoamiView.tsx
+++ b/src/auth/ui/WhoamiView.tsx
@@ -126,7 +126,7 @@ export const WhoamiView: React.FC<WhoamiViewProps> = ({ onComplete }) => {
 
             <Box marginTop={1}>
               <Text color={theme.colors.text.muted}>
-                Use 'elevenlabs auth logout --env &lt;name&gt;' to sign out from specific environment
+                Use 'elevenlabs auth logout' to sign out
               </Text>
             </Box>
           </>
diff --git a/src/shared/elevenlabs-api.ts b/src/shared/elevenlabs-api.ts
index d3321fc..c59984f 100644
--- a/src/shared/elevenlabs-api.ts
+++ b/src/shared/elevenlabs-api.ts
@@ -43,7 +43,7 @@ export function getApiBaseUrl(residency?: Location): string {
 export async function getElevenLabsClient(environment: string = 'prod'): Promise<ElevenLabsClient> {
   const apiKey = await getApiKey(environment);
   if (!apiKey) {
-    throw new Error(`No API key found for environment '${environment}'. Use 'elevenlabs auth login --env ${environment}' to authenticate or set ELEVENLABS_API_KEY environment variable.`);
+    throw new Error(`No API key found for environment '${environment}'. Use 'elevenlabs auth login' to authenticate or set ELEVENLABS_API_KEY environment variable.`);
   }
   
   const config = await loadConfig();
diff --git a/src/shared/tools.ts b/src/shared/tools.ts
index 8d51944..2df1a4e 100644
--- a/src/shared/tools.ts
+++ b/src/shared/tools.ts
@@ -75,7 +75,6 @@ export interface ToolDefinition {
   type: 'webhook' | 'client';
   config?: string;
   id?: string;
-  env?: string;
 }
 
 export interface ToolsConfig {
diff --git a/src/tests/commands/add.ts b/src/tests/commands/add.ts
index d39c19f..e5a0f96 100644
--- a/src/tests/commands/add.ts
+++ b/src/tests/commands/add.ts
@@ -9,21 +9,19 @@ export function createAddCommand(): Command {
     .description('Add a new test')
     .argument('<name>', 'Name of the test to create')
     .option('--template <template>', 'Test template type', 'basic-llm')
-    .option('--env <environment>', 'Environment to create test in', 'prod')
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (name: string, options: { template: string; env: string; ui: boolean }) => {
+    .action(async (name: string, options: { template: string; ui: boolean }) => {
       try {
         if (options.ui !== false) {
           // Use Ink UI for test creation
           const { waitUntilExit } = render(
             React.createElement(AddTestView, {
-              initialName: name,
-              environment: options.env || 'prod'
+              initialName: name
             })
           );
           await waitUntilExit();
         } else {
-          await addTest(name, options.template, options.env);
+          await addTest(name, options.template);
         }
       } catch (error) {
         console.error(`Error creating test: ${error}`);
diff --git a/src/tests/commands/delete.ts b/src/tests/commands/delete.ts
index 0768f6b..f8fc638 100644
--- a/src/tests/commands/delete.ts
+++ b/src/tests/commands/delete.ts
@@ -6,9 +6,8 @@ export function createDeleteCommand(): Command {
     .description('Delete a test locally and from ElevenLabs')
     .argument('[test_id]', 'ID of the test to delete (omit with --all to delete all tests)')
     .option('--all', 'Delete all tests', false)
-    .option('--env <environment>', 'Filter tests by environment (use with --all)')
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (testId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
+    .action(async (testId: string | undefined, options: { all: boolean; ui: boolean }) => {
       try {
         if (options.all && testId) {
           console.error('Error: Cannot specify both test_id and --all flag');
@@ -20,13 +19,8 @@ export function createDeleteCommand(): Command {
           process.exit(1);
         }
 
-        if (options.env && !options.all) {
-          console.error('Error: --env flag can only be used with --all');
-          process.exit(1);
-        }
-
         if (options.all) {
-          await deleteAllTests(options.ui, options.env);
+          await deleteAllTests(options.ui);
         } else {
           await deleteTest(testId!);
         }
diff --git a/src/tests/commands/impl.ts b/src/tests/commands/impl.ts
index 1da33fe..9dec13d 100644
--- a/src/tests/commands/impl.ts
+++ b/src/tests/commands/impl.ts
@@ -18,7 +18,6 @@ interface TestDefinition {
   config: string;
   type?: string;
   id?: string;
-  env?: string;
 }
 
 interface TestsConfig {
@@ -41,7 +40,7 @@ async function promptForConfirmation(message: string): Promise<boolean> {
   });
 }
 
-async function addTest(name: string, templateType: string = "basic-llm", environment?: string): Promise<void> {
+async function addTest(name: string, templateType: string = "basic-llm"): Promise<void> {
   const { getTestTemplateByName } = await import('../templates.js');
 
   // Check if tests.json exists
@@ -61,7 +60,7 @@ async function addTest(name: string, templateType: string = "basic-llm", environ
   const testConfig = getTestTemplateByName(name, templateType);
 
   // Create test in ElevenLabs first to get ID
-  const env = environment || 'prod';
+  const env = 'prod';
   console.log(`Creating test '${name}' in ElevenLabs (environment: ${env})...`);
 
   const client = await getElevenLabsClient(env);
@@ -87,8 +86,7 @@ async function addTest(name: string, templateType: string = "basic-llm", environ
     const newTest: TestDefinition = {
       config: configPath,
       type: templateType,
-      id: testId,
-      env: env
+      id: testId
     };
     testsConfig.tests.push(newTest);
     await writeConfig(testsConfigPath, testsConfig);
@@ -101,7 +99,7 @@ async function addTest(name: string, templateType: string = "basic-llm", environ
     process.exit(1);
   }
 }
-async function pushTests(testId?: string, dryRun = false, environment?: string): Promise<void> {
+async function pushTests(testId?: string, dryRun = false): Promise<void> {
   // Load tests configuration
   const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
   if (!(await fs.pathExists(testsConfigPath))) {
@@ -110,35 +108,24 @@ async function pushTests(testId?: string, dryRun = false, environment?: string):
 
   const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
 
-  // Filter tests by environment and/or test ID
+  // Filter tests by test ID if specified
   let testsToProcess = testsConfig.tests;
-  
-  if (environment) {
-    testsToProcess = testsToProcess.filter(test => (test.env || 'prod') === environment);
-  }
-  
+
   if (testId) {
     testsToProcess = testsToProcess.filter(test => test.id === testId);
     if (testsToProcess.length === 0) {
       throw new Error(`Test with ID '${testId}' not found in configuration`);
     }
   }
-  
-  if (environment && testsToProcess.length === 0) {
-    console.log(`No tests found for environment '${environment}'`);
-    return;
-  }
-  
-  if (!environment) {
-    const envs = [...new Set(testsToProcess.map(t => t.env || 'prod'))];
-    console.log(`Pushing ${testsToProcess.length} test(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
-  }
+
+  const environment = 'prod';
+  console.log(`Pushing ${testsToProcess.length} test(s) to environment: ${environment}`);
 
   let changesMade = false;
 
   for (const testDef of testsToProcess) {
     const configPath = testDef.config;
-    const environment = testDef.env || 'prod';
+    const environment = 'prod';
 
     // Check if config file exists
     if (!(await fs.pathExists(configPath))) {
@@ -209,32 +196,14 @@ async function pushTests(testId?: string, dryRun = false, environment?: string):
     await writeConfig(testsConfigPath, testsConfig);
   }
 }
-async function pullTests(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean; env?: string }): Promise<void> {
+async function pullTests(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean }): Promise<void> {
   // Check if tests.json exists
   const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
-  
-  // Determine which environments to pull from
-  const environmentsToPull: string[] = options.env 
-    ? [options.env] 
-    : await listEnvironments();
-  
-  if (environmentsToPull.length === 0) {
-    console.log('No environments configured. Use "elevenlabs auth login" to add an environment.');
-    return;
-  }
-  
-  if (!options.env) {
-    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
-  }
-  
-  // Pull from each environment
-  for (const environment of environmentsToPull) {
-    console.log(`\n${'='.repeat(50)}`);
-    console.log(`Environment: ${environment}`);
-    console.log('='.repeat(50));
-    
-    await pullTestsFromEnvironment(options, environment, testsConfigPath);
-  }
+  const environment = 'prod';
+
+  console.log(`Pulling from environment: ${environment}`);
+
+  await pullTestsFromEnvironment(options, environment, testsConfigPath);
 }
 
 async function pullTestsFromEnvironment(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean }, environment: string, testsConfigPath: string): Promise<void> {
@@ -283,7 +252,6 @@ async function pullTestsFromEnvironment(options: { test?: string; outputDir: str
   // Build map of existing tests by ID for this environment
   const existingTestIds = new Map(
     testsConfig.tests
-      .filter(test => (test.env || 'prod') === environment)
       .map(test => [test.id, test])
   );
 
@@ -390,8 +358,7 @@ async function pullTestsFromEnvironment(options: { test?: string; outputDir: str
         const newTest: TestDefinition = {
           config: configPath,
           id: test.id,
-          type: testDetailsTyped.type || 'conversational',
-          env: environment
+          type: testDetailsTyped.type || 'conversational'
         };
         
         testsConfig.tests.push(newTest);
@@ -440,7 +407,7 @@ async function deleteTest(testId: string): Promise<void> {
   
   const testDef = testsConfig.tests[testIndex];
   const configPath = testDef.config;
-  const environment = testDef.env || 'prod';
+  const environment = 'prod';
   
   // Read test name from config if available
   let testName = testId;
@@ -480,7 +447,7 @@ async function deleteTest(testId: string): Promise<void> {
   
   console.log(`\n✓ Successfully deleted test '${testName}'`);
 }
-async function deleteAllTests(ui: boolean = true, env?: string): Promise<void> {
+async function deleteAllTests(ui: boolean = true): Promise<void> {
   // Load tests configuration
   const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
   if (!(await fs.pathExists(testsConfigPath))) {
@@ -488,25 +455,16 @@ async function deleteAllTests(ui: boolean = true, env?: string): Promise<void> {
   }
 
   const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
-  
+
   if (testsConfig.tests.length === 0) {
     console.log('No tests found to delete');
     return;
   }
 
-  // Filter tests by environment if specified
-  const testsToDelete = env 
-    ? testsConfig.tests.filter(test => (test.env || 'prod') === env)
-    : testsConfig.tests;
-  
-  if (testsToDelete.length === 0) {
-    console.log(env ? `No tests found in environment '${env}'` : 'No tests found to delete');
-    return;
-  }
-  
+  const testsToDelete = testsConfig.tests;
+
   // Show what will be deleted
-  const envInfo = env ? ` in environment '${env}'` : '';
-  console.log(`\nFound ${testsToDelete.length} test(s) to delete${envInfo}:`);
+  console.log(`\nFound ${testsToDelete.length} test(s) to delete:`);
   for (let i = 0; i < testsToDelete.length; i++) {
     const test = testsToDelete[i];
     let testName = test.id || 'Unknown';
@@ -518,16 +476,12 @@ async function deleteAllTests(ui: boolean = true, env?: string): Promise<void> {
         // Use ID if config read fails
       }
     }
-    const testEnv = test.env || 'prod';
-    console.log(`  ${i + 1}. ${testName} (${test.id}) [${testEnv}]`);
+    console.log(`  ${i + 1}. ${testName} (${test.id})`);
   }
   
   // Confirm deletion (skip if --no-ui)
   if (ui) {
-    const warningMsg = env 
-      ? `\nWARNING: This will delete ${testsToDelete.length} test(s) from environment '${env}' in both local configuration and ElevenLabs.`
-      : '\nWARNING: This will delete ALL tests from both local configuration and ElevenLabs.';
-    console.log(warningMsg);
+    console.log('\nWARNING: This will delete ALL tests from both local configuration and ElevenLabs.');
     const confirmed = await promptForConfirmation('Are you sure you want to delete these tests?');
     
     if (!confirmed) {
@@ -545,8 +499,8 @@ async function deleteAllTests(ui: boolean = true, env?: string): Promise<void> {
   // Delete each test
   for (const testDef of testsToDelete) {
     try {
-      const environment = testDef.env || 'prod';
-      
+      const environment = 'prod';
+
       // Read test name from config if available
       let testName = testDef.id || 'Unknown';
       if (testDef.config && await fs.pathExists(testDef.config)) {
diff --git a/src/tests/commands/pull.ts b/src/tests/commands/pull.ts
index 17544a8..7c7b8a4 100644
--- a/src/tests/commands/pull.ts
+++ b/src/tests/commands/pull.ts
@@ -7,7 +7,6 @@ interface PullTestsOptions {
   dryRun: boolean;
   update?: boolean;
   all?: boolean;
-  env?: string;
 }
 
 export function createPullCommand(): Command {
@@ -18,7 +17,6 @@ export function createPullCommand(): Command {
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--update', 'Update existing items only, skip new')
     .option('--all', 'Pull all (new + existing)')
-    .option('--env <environment>', 'Environment to pull from')
     .option('--no-ui', 'Disable interactive UI')
     .action(async (options: PullTestsOptions & { ui: boolean }) => {
       try {
diff --git a/src/tests/commands/push.ts b/src/tests/commands/push.ts
index 2e57727..51d3286 100644
--- a/src/tests/commands/push.ts
+++ b/src/tests/commands/push.ts
@@ -4,12 +4,11 @@ import { pushTests } from './impl.js';
 export function createPushCommand(): Command {
   return new Command('push')
     .description('Push tests to ElevenLabs API')
-    .option('--env <environment>', 'Filter tests by environment')
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { dryRun: boolean; env?: string; ui: boolean }) => {
+    .action(async (options: { dryRun: boolean; ui: boolean }) => {
       try {
-        await pushTests(undefined, options.dryRun, options.env);
+        await pushTests(undefined, options.dryRun);
       } catch (error) {
         console.error(`Error during push: ${error}`);
         process.exit(1);
diff --git a/src/tests/ui/AddTestView.tsx b/src/tests/ui/AddTestView.tsx
index ed86bdd..6c7979b 100644
--- a/src/tests/ui/AddTestView.tsx
+++ b/src/tests/ui/AddTestView.tsx
@@ -8,7 +8,6 @@ import theme from '../../ui/themes/elevenlabs.js';
 
 interface AddTestViewProps {
   initialName?: string;
-  environment?: string;
   onComplete?: () => void;
 }
 
@@ -45,7 +44,6 @@ const templateOptions: TemplateOption[] = [
 
 export const AddTestView: React.FC<AddTestViewProps> = ({
   initialName = '',
-  environment = 'prod',
   onComplete
 }) => {
   const { exit } = useApp();
@@ -152,7 +150,7 @@ export const AddTestView: React.FC<AddTestViewProps> = ({
 
       // Create test in ElevenLabs first to get ID
       const { getElevenLabsClient, createTestApi } = await import('../../shared/elevenlabs-api.js');
-      const client = await getElevenLabsClient(environment);
+      const client = await getElevenLabsClient('prod');
 
       const { toCamelCaseKeys, generateUniqueFilename } = await import('../../shared/utils.js');
       const testApiConfig = toCamelCaseKeys(testConfig) as unknown as any;
@@ -171,7 +169,7 @@ export const AddTestView: React.FC<AddTestViewProps> = ({
 
       // Create/update tests.json
       const testsConfigPath = path.resolve('tests.json');
-      let testsConfig: { tests: Array<{ config: string; type: string; id?: string; env?: string }> };
+      let testsConfig: { tests: Array<{ config: string; type: string; id?: string }> };
 
       try {
         testsConfig = await readConfig(testsConfigPath);
@@ -185,15 +183,13 @@ export const AddTestView: React.FC<AddTestViewProps> = ({
         testsConfig.tests[existingTestIndex] = {
           config: configPath,
           type: selectedTemplate,
-          id: testId,
-          env: environment
+          id: testId
         };
       } else {
         testsConfig.tests.push({
           config: configPath,
           type: selectedTemplate,
-          id: testId,
-          env: environment
+          id: testId
         });
       }
 
diff --git a/src/tests/ui/TestsHelpView.tsx b/src/tests/ui/TestsHelpView.tsx
index 25e965a..dfef752 100644
--- a/src/tests/ui/TestsHelpView.tsx
+++ b/src/tests/ui/TestsHelpView.tsx
@@ -16,7 +16,6 @@ const commands: Command[] = [
     description: "Add a new test",
     options: [
       { flag: "--template <template>", description: "Test template type (default: 'basic-llm')" },
-      { flag: "--env <environment>", description: "Environment to create test in (default: 'prod')" },
     ],
   },
   {
@@ -24,14 +23,12 @@ const commands: Command[] = [
     description: "Delete a test locally and from ElevenLabs",
     options: [
       { flag: "--all", description: "Delete all tests" },
-      { flag: "--env <environment>", description: "Filter tests by environment (use with --all)" },
     ],
   },
   {
     name: "push",
     description: "Push tests to ElevenLabs API",
     options: [
-      { flag: "--env <environment>", description: "Filter tests by environment" },
       { flag: "--dry-run", description: "Show what would be done without making changes" },
     ],
   },
@@ -44,7 +41,6 @@ const commands: Command[] = [
       { flag: "--dry-run", description: "Show what would be done without making changes" },
       { flag: "--update", description: "Update existing items only, skip new" },
       { flag: "--all", description: "Pull all (new + existing)" },
-      { flag: "--env <environment>", description: "Environment to pull from" },
     ],
   },
 ];
diff --git a/src/tools/commands/add.ts b/src/tools/commands/add.ts
index 61820d4..d9d43c9 100644
--- a/src/tools/commands/add.ts
+++ b/src/tools/commands/add.ts
@@ -7,15 +7,14 @@ export function createAddCommand(): Command {
     .argument('<name>', 'Name of the tool to create')
     .option('--type <type>', 'Tool type: webhook or client', 'webhook')
     .option('--config-path <path>', 'Custom config path (optional)')
-    .option('--env <environment>', 'Environment to create tool in', 'prod')
-    .action(async (name: string, options: { type: string; configPath?: string; env: string }) => {
+    .action(async (name: string, options: { type: string; configPath?: string }) => {
       try {
         if (options.type !== 'webhook' && options.type !== 'client') {
           console.error('Error: --type must be either "webhook" or "client"');
           process.exit(1);
         }
 
-        await addTool(name, options.type as 'webhook' | 'client', options.configPath, options.env);
+        await addTool(name, options.type as 'webhook' | 'client', options.configPath);
       } catch (error) {
         console.error(`Error creating tool: ${error}`);
         process.exit(1);
diff --git a/src/tools/commands/delete.ts b/src/tools/commands/delete.ts
index 77b26f1..c105a08 100644
--- a/src/tools/commands/delete.ts
+++ b/src/tools/commands/delete.ts
@@ -6,9 +6,8 @@ export function createDeleteCommand(): Command {
     .description('Delete a tool locally and from ElevenLabs')
     .argument('[tool_id]', 'ID of the tool to delete (omit with --all to delete all tools)')
     .option('--all', 'Delete all tools', false)
-    .option('--env <environment>', 'Filter tools by environment (use with --all)')
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (toolId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
+    .action(async (toolId: string | undefined, options: { all: boolean; ui: boolean }) => {
       try {
         if (options.all && toolId) {
           console.error('Error: Cannot specify both tool_id and --all flag');
@@ -20,13 +19,8 @@ export function createDeleteCommand(): Command {
           process.exit(1);
         }
 
-        if (options.env && !options.all) {
-          console.error('Error: --env flag can only be used with --all');
-          process.exit(1);
-        }
-
         if (options.all) {
-          await deleteAllTools(options.ui, options.env);
+          await deleteAllTools(options.ui);
         } else {
           await deleteTool(toolId!);
         }
diff --git a/src/tools/commands/impl.ts b/src/tools/commands/impl.ts
index ca77181..4012bed 100644
--- a/src/tools/commands/impl.ts
+++ b/src/tools/commands/impl.ts
@@ -38,7 +38,7 @@ async function promptForConfirmation(message: string): Promise<boolean> {
   });
 }
 
-async function addTool(name: string, type: 'webhook' | 'client', configPath?: string, environment?: string): Promise<void> {
+async function addTool(name: string, type: 'webhook' | 'client', configPath?: string): Promise<void> {
   // Check if tools.json exists, create if not
   const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
   let toolsConfig: ToolsConfig;
@@ -98,7 +98,7 @@ async function addTool(name: string, type: 'webhook' | 'client', configPath?: st
   }
   
   // Create tool in ElevenLabs first to get ID
-  const env = environment || 'prod';
+  const env = 'prod';
   console.log(`Creating ${type} tool '${name}' in ElevenLabs (environment: ${env})...`);
   
   const client = await getElevenLabsClient(env);
@@ -125,8 +125,7 @@ async function addTool(name: string, type: 'webhook' | 'client', configPath?: st
     const newTool: ToolDefinition = {
       type,
       config: configPath,
-      id: toolId,
-      env: env
+      id: toolId
     };
     toolsConfig.tools.push(newTool);
     await writeToolsConfig(toolsConfigPath, toolsConfig);
@@ -139,7 +138,7 @@ async function addTool(name: string, type: 'webhook' | 'client', configPath?: st
     process.exit(1);
   }
 }
-async function pushTools(toolId?: string, dryRun = false, environment?: string): Promise<void> {
+async function pushTools(toolId?: string, dryRun = false): Promise<void> {
   // Load tools configuration
   const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
   if (!(await fs.pathExists(toolsConfigPath))) {
@@ -148,35 +147,24 @@ async function pushTools(toolId?: string, dryRun = false, environment?: string):
 
   const toolsConfig = await readToolsConfig(toolsConfigPath);
 
-  // Filter tools by environment and/or tool ID
+  // Filter tools by tool ID if specified
   let toolsToProcess = toolsConfig.tools;
-  
-  if (environment) {
-    toolsToProcess = toolsToProcess.filter(tool => (tool.env || 'prod') === environment);
-  }
-  
+
   if (toolId) {
     toolsToProcess = toolsToProcess.filter(tool => tool.id === toolId);
     if (toolsToProcess.length === 0) {
       throw new Error(`Tool with ID '${toolId}' not found in configuration`);
     }
   }
-  
-  if (environment && toolsToProcess.length === 0) {
-    console.log(`No tools found for environment '${environment}'`);
-    return;
-  }
-  
-  if (!environment) {
-    const envs = [...new Set(toolsToProcess.map(t => t.env || 'prod'))];
-    console.log(`Pushing ${toolsToProcess.length} tool(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
-  }
+
+  const environment = 'prod';
+  console.log(`Pushing ${toolsToProcess.length} tool(s) to environment: ${environment}`);
 
   let changesMade = false;
 
   for (const toolDef of toolsToProcess) {
     const configPath = toolDef.config;
-    const environment = toolDef.env || 'prod';
+    const environment = 'prod';
 
     if (!configPath) {
       console.log(`Warning: No config path specified`);
@@ -253,29 +241,11 @@ async function pushTools(toolId?: string, dryRun = false, environment?: string):
 async function pullTools(options: PullToolsOptions): Promise<void> {
   // Check if tools.json exists, create if not
   const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-  
-  // Determine which environments to pull from
-  const environmentsToPull: string[] = options.env 
-    ? [options.env] 
-    : await listEnvironments();
-  
-  if (environmentsToPull.length === 0) {
-    console.log('No environments configured. Use "elevenlabs auth login" to add an environment.');
-    return;
-  }
-  
-  if (!options.env) {
-    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
-  }
-  
-  // Pull from each environment
-  for (const environment of environmentsToPull) {
-    console.log(`\n${'='.repeat(50)}`);
-    console.log(`Environment: ${environment}`);
-    console.log('='.repeat(50));
-    
-    await pullToolsFromEnvironment(options, environment, toolsConfigPath);
-  }
+  const environment = 'prod';
+
+  console.log(`Pulling from environment: ${environment}`);
+
+  await pullToolsFromEnvironment(options, environment, toolsConfigPath);
 }
 
 async function pullToolsFromEnvironment(options: PullToolsOptions, environment: string, toolsConfigPath: string): Promise<void> {
@@ -333,7 +303,6 @@ async function pullToolsFromEnvironment(options: PullToolsOptions, environment:
   // Build map of existing tools by ID for this environment
   const existingToolIds = new Map(
     toolsConfig.tools
-      .filter(tool => (tool.env || 'prod') === environment)
       .map(tool => [tool.id, tool])
   );
 
@@ -457,7 +426,6 @@ async function pullToolsFromEnvironment(options: PullToolsOptions, environment:
           type: toolType as 'webhook' | 'client',
           config: configPath,
           id: tool.id,
-          env: environment
         };
         
         toolsConfig.tools.push(newTool);
@@ -506,7 +474,7 @@ async function deleteTool(toolId: string): Promise<void> {
   
   const toolDef = toolsConfig.tools[toolIndex];
   const configPath = toolDef.config;
-  const environment = toolDef.env || 'prod';
+  const environment = 'prod';
   
   // Read tool name from config if available
   let toolName = toolId;
@@ -553,7 +521,7 @@ async function deleteTool(toolId: string): Promise<void> {
   console.log(`
 ✓ Successfully deleted tool '${toolName}'`);
 }
-async function deleteAllTools(ui: boolean = true, env?: string): Promise<void> {
+async function deleteAllTools(ui: boolean = true): Promise<void> {
   // Load tools configuration
   const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
   if (!(await fs.pathExists(toolsConfigPath))) {
@@ -561,25 +529,16 @@ async function deleteAllTools(ui: boolean = true, env?: string): Promise<void> {
   }
 
   const toolsConfig = await readToolsConfig(toolsConfigPath);
-  
+
   if (toolsConfig.tools.length === 0) {
     console.log('No tools found to delete');
     return;
   }
 
-  // Filter tools by environment if specified
-  const toolsToDelete = env 
-    ? toolsConfig.tools.filter(tool => (tool.env || 'prod') === env)
-    : toolsConfig.tools;
-  
-  if (toolsToDelete.length === 0) {
-    console.log(env ? `No tools found in environment '${env}'` : 'No tools found to delete');
-    return;
-  }
-  
+  const toolsToDelete = toolsConfig.tools;
+
   // Show what will be deleted
-  const envInfo = env ? ` in environment '${env}'` : '';
-  console.log(`\nFound ${toolsToDelete.length} tool(s) to delete${envInfo}:`);
+  console.log(`\nFound ${toolsToDelete.length} tool(s) to delete:`);
   for (let i = 0; i < toolsToDelete.length; i++) {
     const tool = toolsToDelete[i];
     let toolName = tool.id || 'Unknown';
@@ -591,16 +550,12 @@ async function deleteAllTools(ui: boolean = true, env?: string): Promise<void> {
         // Use ID if config read fails
       }
     }
-    const toolEnv = tool.env || 'prod';
-    console.log(`  ${i + 1}. ${toolName} (${tool.id}) [${toolEnv}]`);
+    console.log(`  ${i + 1}. ${toolName} (${tool.id})`);
   }
   
   // Confirm deletion (skip if --no-ui)
   if (ui) {
-    const warningMsg = env 
-      ? `\nWARNING: This will delete ${toolsToDelete.length} tool(s) from environment '${env}' in both local configuration and ElevenLabs.`
-      : '\nWARNING: This will delete ALL tools from both local configuration and ElevenLabs.';
-    console.log(warningMsg);
+    console.log('\nWARNING: This will delete ALL tools from both local configuration and ElevenLabs.');
     const confirmed = await promptForConfirmation('Are you sure you want to delete these tools?');
     
     if (!confirmed) {
@@ -618,7 +573,7 @@ async function deleteAllTools(ui: boolean = true, env?: string): Promise<void> {
   // Delete each tool
   for (const toolDef of toolsToDelete) {
     try {
-      const environment = toolDef.env || 'prod';
+      const environment = 'prod';
       
       // Read tool name from config if available
       let toolName = toolDef.id || 'Unknown';
diff --git a/src/tools/commands/pull.ts b/src/tools/commands/pull.ts
index 1c4cd21..ed69a07 100644
--- a/src/tools/commands/pull.ts
+++ b/src/tools/commands/pull.ts
@@ -10,7 +10,6 @@ interface PullToolsOptions {
   dryRun: boolean;
   update?: boolean;
   all?: boolean;
-  env?: string;
 }
 
 export function createPullCommand(): Command {
@@ -21,13 +20,12 @@ export function createPullCommand(): Command {
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--update', 'Update existing items only, skip new')
     .option('--all', 'Pull all (new + existing)')
-    .option('--env <environment>', 'Environment to pull from')
     .option('--no-ui', 'Disable interactive UI')
     .action(async (options: PullToolsOptions & { ui: boolean }) => {
       try {
         if (options.ui !== false) {
           // Use Ink UI for pull
-          const environments = options.env ? [options.env] : ['prod'];
+          const environments = ['prod'];
           const { waitUntilExit } = render(
             React.createElement(PullToolsView, {
               tool: options.tool,
diff --git a/src/tools/commands/push.ts b/src/tools/commands/push.ts
index 6859d80..a4c1853 100644
--- a/src/tools/commands/push.ts
+++ b/src/tools/commands/push.ts
@@ -4,17 +4,16 @@ import { pushTools } from './impl.js';
 export function createPushCommand(): Command {
   return new Command('push')
     .description('Push tools to ElevenLabs API')
-    .option('--env <environment>', 'Filter tools by environment')
     .option('--dry-run', 'Show what would be done without making changes', false)
     .option('--no-ui', 'Disable interactive UI')
-    .action(async (options: { dryRun: boolean; env?: string; ui: boolean }) => {
+    .action(async (options: { dryRun: boolean; ui: boolean }) => {
       try {
         if (options.ui !== false) {
           // PushToolsView requires tools array to be prepared
           // For now, use the non-UI implementation
-          await pushTools(undefined, options.dryRun, options.env);
+          await pushTools(undefined, options.dryRun);
         } else {
-          await pushTools(undefined, options.dryRun, options.env);
+          await pushTools(undefined, options.dryRun);
         }
       } catch (error) {
         console.error(`Error during push: ${error}`);
diff --git a/src/tools/ui/PullToolsView.tsx b/src/tools/ui/PullToolsView.tsx
index 20371e9..98f5bd1 100644
--- a/src/tools/ui/PullToolsView.tsx
+++ b/src/tools/ui/PullToolsView.tsx
@@ -20,7 +20,6 @@ import { generateUniqueFilename } from '../../shared/utils.js';
 interface PullTool {
   name: string;
   id: string;
-  env: string;
   type?: string;
   status: 'pending' | 'pulling' | 'completed' | 'error' | 'skipped';
   action?: 'create' | 'update' | 'skip';
@@ -81,10 +80,9 @@ export const PullToolsView: React.FC<PullToolsViewProps> = ({
         for (const environment of environments) {
           const client = await getElevenLabsClient(environment);
 
-          // Build ID-based map for existing tools in this environment
+          // Build ID-based map for existing tools
           const existingToolIds = new Map(
             toolsConfig.tools
-              .filter((t: ToolDefinition) => (t.env || 'prod') === environment)
               .map((tool: ToolDefinition) => [tool.id, tool])
           );
 
@@ -145,7 +143,6 @@ export const PullToolsView: React.FC<PullToolsViewProps> = ({
             allToolsToPull.push({
               name: toolName,
               id: toolId,
-              env: environment,
               type: (toolItem as any).tool_config?.type || (toolItem as any).type,
               action,
               status,
@@ -221,7 +218,7 @@ export const PullToolsView: React.FC<PullToolsViewProps> = ({
       }
 
       try {
-        const client = await getElevenLabsClient(toolToPull.env);
+        const client = await getElevenLabsClient('prod');
         const toolDetails = await getToolApi(client, toolToPull.id);
 
         // Extract the tool_config from the response
@@ -277,8 +274,7 @@ export const PullToolsView: React.FC<PullToolsViewProps> = ({
           const newTool: ToolDefinition = {
             type: toolType as 'webhook' | 'client',
             config: configPath,
-            id: toolToPull.id,
-            env: toolToPull.env
+            id: toolToPull.id
           };
 
           toolsConfig.tools.push(newTool);
@@ -412,7 +408,7 @@ export const PullToolsView: React.FC<PullToolsViewProps> = ({
                       <StatusCard
                         title={tool.name}
                         status={getStatusType(tool.status)}
-                        message={tool.message || `Type: ${tool.type || 'unknown'} | Env: ${tool.env}`}
+                        message={tool.message || `Type: ${tool.type || 'unknown'}`}
                         borderStyle="single"
                       />
                     </Box>
diff --git a/src/tools/ui/PushToolsView.tsx b/src/tools/ui/PushToolsView.tsx
index fee635d..948f4d8 100644
--- a/src/tools/ui/PushToolsView.tsx
+++ b/src/tools/ui/PushToolsView.tsx
@@ -14,7 +14,6 @@ interface PushTool {
   status: 'pending' | 'checking' | 'pushing' | 'completed' | 'error' | 'skipped';
   message?: string;
   toolId?: string;
-  env: string;
 }
 
 interface PushToolsViewProps {
@@ -96,7 +95,7 @@ export const PushToolsView: React.FC<PushToolsViewProps> = ({
           );
 
           // Get ElevenLabs client for this tool's environment
-          const client = await getElevenLabsClient(tool.env);
+          const client = await getElevenLabsClient('prod');
 
           if (!toolId) {
             // Create new tool
@@ -185,9 +184,6 @@ export const PushToolsView: React.FC<PushToolsViewProps> = ({
             <Box width={30}>
               <Text color={theme.colors.text.muted} bold>NAME</Text>
             </Box>
-            <Box width={10}>
-              <Text color={theme.colors.text.muted} bold>ENV</Text>
-            </Box>
             <Box width={15}>
               <Text color={theme.colors.text.muted} bold>STATUS</Text>
             </Box>
@@ -237,9 +233,6 @@ export const PushToolsView: React.FC<PushToolsViewProps> = ({
                 <Box width={30}>
                   <Text color={theme.colors.text.primary}>{displayName}</Text>
                 </Box>
-                <Box width={10}>
-                  <Text color={theme.colors.accent.secondary}>{tool.env}</Text>
-                </Box>
                 <Box width={15}>
                   <Text color={statusColor}>{statusText}</Text>
                 </Box>
diff --git a/src/tools/ui/ToolsHelpView.tsx b/src/tools/ui/ToolsHelpView.tsx
index 13851e1..2059cfc 100644
--- a/src/tools/ui/ToolsHelpView.tsx
+++ b/src/tools/ui/ToolsHelpView.tsx
@@ -17,7 +17,6 @@ const commands: Command[] = [
     options: [
       { flag: "--type <type>", description: "Tool type: webhook or client (default: 'webhook')" },
       { flag: "--config-path <path>", description: "Custom config path" },
-      { flag: "--env <environment>", description: "Environment to create tool in (default: 'prod')" },
     ],
   },
   {
@@ -25,14 +24,12 @@ const commands: Command[] = [
     description: "Delete a tool locally and from ElevenLabs",
     options: [
       { flag: "--all", description: "Delete all tools" },
-      { flag: "--env <environment>", description: "Filter tools by environment (use with --all)" },
     ],
   },
   {
     name: "push",
     description: "Push tools to ElevenLabs API",
     options: [
-      { flag: "--env <environment>", description: "Filter tools by environment" },
       { flag: "--dry-run", description: "Show what would be done without making changes" },
     ],
   },
@@ -45,7 +42,6 @@ const commands: Command[] = [
       { flag: "--dry-run", description: "Show what would be done without making changes" },
       { flag: "--update", description: "Update existing items only, skip new" },
       { flag: "--all", description: "Pull all (new + existing)" },
-      { flag: "--env <environment>", description: "Environment to pull from" },
     ],
   },
 ];