diff --git a/bootstrap b/bootstrap
index 5b24397..435d245 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,8 +4,8 @@
 #
 
 if [ -z "$DEV_ENV" ]; then
-  echo "env var DEV_ENV needs to be present"
-  exit 1
+	echo "env var DEV_ENV needs to be present"
+	exit 1
 fi
 
 # if i just did DEV_ENV=$(pwd) ./run then this is needed for the rest of the
@@ -15,15 +15,16 @@ export DEV_ENV="$DEV_ENV"
 args=""
 
 while [[ $# -gt 0 ]]; do
-  if [[ "$1" =~ dry ]]; then
-    args="--dry-run"
-  fi
+	if [[ "$1" =~ dry ]]; then
+		args="--dry-run"
+	fi
 done
 
 echo "Args to bootstrap scripts: $args"
 echo "Installing packages may require your password multiple times."
 
-echo "Running packages" && $DEV_ENV/run "$args"
 echo "Installing configuration" && $DEV_ENV/dev-env "$args"
+# TODO: Need to run system run early, then once ssh keys are setup pull
+# 			git submodules, then run config install again.
+echo "Running packages" && $DEV_ENV/run "$args"
 echo "Installing webapps" && $DEV_ENV/webapp "$args"
-echo "Starting system services" && $DEV_ENV/system "$args"
diff --git a/system b/system
deleted file mode 100755
index 7ee85f8..0000000
--- a/system
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-# Enable system services.
-
-dry_run="0"
-while [[ $# -gt 0 ]]; do
-	echo "ARG: \"$1\""
-
-	# Handle a --dry or --dry-run argument
-	if [[ "$1" =~ ^--dry ]]; then
-		dry_run="1"
-	fi
-	shift
-done
-
-log() {
-	if [[ $dry_run == "1" ]]; then
-		echo "[DRY_RUN]: $1"
-	else
-		echo "$1"
-	fi
-}
-
-log_and_run() {
-	log "Running: \"$*\""
-
-	if [[ $dry_run == "0" ]]; then
-		eval "$1"
-	fi
-}
-
-log_and_run "sudo chsh --shell $(which zsh)"
-log_and_run "systemctl --user daemon-reload"
-log_and_run "systemctl --user enable --now hyprpaper.service"
-log_and_run "systemctl --user enable --now hypridle.service"
-log_and_run "espanso service register"
-log_and_run "sudo setcap "cap_dac_override+p" $(which espanso)"
-
-log_and_run "systemctl --user enable --now logout-task.service"
-log_and_run "systemctl --user enable --now battery-monitor.timer"
-log_and_run "systemctl --user enable --now tmux-kill-sessions.timer"
-log_and_run "sudo systemctl enable --now pcscd.service"
-log_and_run "sudo systemctl enable --now firewalld.service"