diff --git a/flags.go b/flags.go
index 95def1e..56e7a88 100644
--- a/flags.go
+++ b/flags.go
@@ -70,12 +70,7 @@ func parseCommonOptions() (*commonOptions, error) {
 	}
 	opts.maxTabs = cFlags.maxTabs
 
-	// Fall back on env var for prefix
 	opts.prefix = cFlags.prefix
-	if opts.prefix == "" {
-		opts.prefix = os.Getenv(getEnvVarName(envVarPrefix))
-	}
-
 	opts.clipboard = cFlags.clipboard
 	opts.verbose = cFlags.verbose
 
diff --git a/main.go b/main.go
index 5e6d9f8..ed49083 100644
--- a/main.go
+++ b/main.go
@@ -39,7 +39,6 @@ func main() {
 
 	case versionCmd.Name():
 		displayVersion()
-		os.Exit(0)
 
 	default:
 		fmt.Printf("Error: unrecognized subcommand %s\n", subCmd)