diff --git a/setup/so-functions b/setup/so-functions
index db871271c..a8802ecde 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -704,8 +704,7 @@ fireeye_pillar() {
 
 # Run a salt command to generate the minion key
 salt_firstcheckin() {
-	echo "Next line will show [ERROR], this is expected" >> "$setup_log" 2>&1
-	salt-call state.show_top >> "$setup_log" 2>&1
+	salt-call state.show_top >> /dev/null # send output to /dev/null because we don't actually care about the ouput
 }
 
 fleet_pillar() {
@@ -1171,12 +1170,6 @@ salt_checkin() {
 	} >> "$setup_log" 2>&1
 }
 
-salt_firstcheckin() {
-	#First Checkin
-	salt-call state.highstate >> "$setup_log" 2>&1
-
-}
-
 setup_salt_master_dirs() {
 	# Create salt paster directories
 	mkdir -p /opt/so/saltstack/salt
diff --git a/setup/so-setup b/setup/so-setup
index 7ea298a7d..314ffd65d 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -332,17 +332,17 @@ export percentage=0
 	fi
 
 	if [[ $is_master ]]; then
-		set_progress_str 21 'Accepting Salt key'
+		set_progress_str 20 'Accepting Salt key'
 		salt-key -ya "$MINION_ID" >> "$setup_log" 2>&1
 	fi
 
-	set_progress_str 22 'Copying minion pillars to master'
+	set_progress_str 21 'Copying minion pillars to master'
 	copy_minion_tmp_files 2>> "$setup_log"
 
-	set_progress_str 23 'Generating CA and checking in'
+	set_progress_str 22 'Generating CA and checking in'
 	salt_checkin 2>> "$setup_log"
 
-	set_progress_str 24 "$(print_salt_state_apply 'schedule')"
+	set_progress_str 23 "$(print_salt_state_apply 'schedule')"
 	salt-call state.apply -l info schedule >> $setup_log 2>&1