diff --git a/general_setup b/general_setup
index e722c64..3764ecf 100755
--- a/general_setup
+++ b/general_setup
@@ -20,22 +20,13 @@
 # This file is contains code that is common among the test wrappers.
 #
 
-#
-# Source .bashrc to keep pbench happy.
-# 
 test_cmd=$0
-source ~/.bashrc
-
 # Values setting for test wrappers to use.
 #
 # TOOLS_BIN: points to the tool directory
 # to_home_root: home directory
 # to_configuration: configuration information
 # to_times_to_run: number of times to run the test
-# to_pbench: Run the test via pbench
-# to_pbench_copy: Copy the pbench data, not move it.
-# to_puser: User running pbench
-# to_pstats: pbench stats to use
 # to_run_label: Label for the run
 # to_user: User on the test system running the test
 # to_sys_type: for results info, basically aws, azure or local
@@ -56,11 +47,6 @@ gs_usage_info()
 	echo "  --iterations <value>: Number of times to run the test, defaults to 1."
 	echo "  --iteration_default <value>: Value to set iterations to, if default is not set."
 	echo "  --no_pkg_install: Test is not to use dnf/yum/apt or other such tools"
-	echo "  --pbench: use pbench-user-benchmark and place information into pbench, defaults to do not use."
-	echo "  --pbench_user <value>: user who started everything. Defaults to the current user."
-	echo "  --pbench_copy: Copy the pbench data, not move it."
-	echo "  --pbench_stats: What stats to gather. Defaults to all stats."
-	echo "  --run_label: the label to associate with the pbench run. No default setting."
 	echo "  --run_user: user that is actually running the test on the test system. Defaults to user running wrapper."
 	echo "  --sys_type: Type of system working with, aws, azure, hostname.  Defaults to hostname."
 	echo "  --sysname: name of the system running, used in determining config files.  Defaults to hostname."
@@ -79,17 +65,12 @@ to_home_root=`echo $HOME | rev | cut -d'/' -f 2- | rev`
 if [[ $to_home_root == "" ]]; then
 	to_home_root="/"
 fi
-to_pbench=0
-to_pbench_copy="0"
 
-to_puser=`whoami`
-to_run_user=`whoami`
 to_times_to_run=0
 iteration_default=1
 to_run_label=""
 to_user=`whoami`
 to_sysname=`hostname`
-to_pstats="default"
 to_no_pkg_install=0
 
 to_tuned_setting=""
@@ -133,31 +114,6 @@ do
 			to_no_pkg_install=1
 			shift 1
 		;;
-		--pbench)
-			to_pbench=1
-			i=$((i + 1))
-			shift 1
-		;;
-		--pbench_copy)
-			to_pbench_copy=1
-			i=$((i + 1))
-			shift 1
-		;;
-		--pbench_stats)
-			i=$((i + 2))
-			to_pstats=$value
-			shift 2
-		;;
-		--pbench_user)
-			i=$((i + 2))
-			to_puser=$value
-			shift 2
-		;;
-		--run_label)
-			i=$((i + 2))
-			to_run_label=$value
-			shift 2
-		;;
 		--run_user)
 			i=$((i + 2))
 			to_user=$value