diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh
index c935c81a..26c50c78 100755
--- a/automation_tools/pre_build_automation.sh
+++ b/automation_tools/pre_build_automation.sh
@@ -189,22 +189,20 @@ handle_thisrepo() {
 }
 
 # Process the task list
-if [ "$use_cached" != "y" ]; then
-  while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do
-    if [[ ! "$action" == "#"* ]] && [[ -n "$action" ]]; then
-      case "$action" in
-        "branch" ) handle_branch "$placeholder" ;;
-        "hash" ) handle_hash "$placeholder" "$url" ;;
-        "latestcommit" ) handle_latestcommit "$placeholder" "$url" "$branch" ;;
-        "latestghtag" ) handle_latestghtag "$placeholder" "$url" ;;
-        "latestghrelease" ) handle_latestghrelease "$placeholder" "$url" "$branch" ;;
-        "latestghreleasesha" ) handle_latestghreleasesha "$placeholder" "$url" "$branch" ;;
-        "outside_file" ) handle_outside_file "$placeholder" "$url" ;;
-        "outside_env_var" ) handle_outside_env_var "$placeholder" "$url" ;;
-        "custom_command" ) handle_custom_command "$url" ;;
-        "url" ) handle_url "$placeholder" "$url" ;;
-        "THISREPO" ) handle_thisrepo "$placeholder" ;;
-      esac
-    fi
-  done < "$automation_task_list"
-fi
+while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do
+  if [[ ! "$action" == "#"* ]] && [[ -n "$action" ]]; then
+    case "$action" in
+      "branch" ) handle_branch "$placeholder" ;;
+      "hash" ) handle_hash "$placeholder" "$url" ;;
+      "latestcommit" ) handle_latestcommit "$placeholder" "$url" "$branch" ;;
+      "latestghtag" ) handle_latestghtag "$placeholder" "$url" ;;
+      "latestghrelease" ) handle_latestghrelease "$placeholder" "$url" "$branch" ;;
+      "latestghreleasesha" ) handle_latestghreleasesha "$placeholder" "$url" "$branch" ;;
+      "outside_file" ) handle_outside_file "$placeholder" "$url" ;;
+      "outside_env_var" ) handle_outside_env_var "$placeholder" "$url" ;;
+      "custom_command" ) handle_custom_command "$url" ;;
+      "url" ) handle_url "$placeholder" "$url" ;;
+      "THISREPO" ) handle_thisrepo "$placeholder" ;;
+    esac
+  fi
+done < "$automation_task_list"
diff --git a/developer_toolbox/build_retrodeck_locally.sh b/developer_toolbox/build_retrodeck_locally.sh
index 76638590..18899f75 100755
--- a/developer_toolbox/build_retrodeck_locally.sh
+++ b/developer_toolbox/build_retrodeck_locally.sh
@@ -3,12 +3,12 @@
 # WARNING: run this script from the project root folder, not from here!!
 
 # Check if script is running with elevated privileges
-if [ "$EUID" -ne 0 ]; then
-    read -rp "The build might fail without some superuser permissions, please run me with sudo. Continue WITHOUT sudo (not suggested)? [y/N] " continue_without_sudo
-    if [[ "$continue_without_sudo" != "y" ]]; then
-        exit 1
-    fi
-fi
+# if [ "$EUID" -ne 0 ]; then
+#     read -rp "The build might fail without some superuser permissions, please run me with sudo. Continue WITHOUT sudo (not suggested)? [y/N] " continue_without_sudo
+#     if [[ "$continue_without_sudo" != "y" ]]; then
+#         exit 1
+#     fi
+# fi
 
 git submodule update --init --recursive
 
@@ -21,19 +21,6 @@ ostree init --mode=archive-z2 --repo=${GITHUB_WORKSPACE}/retrodeck-repo
 cp net.retrodeck.retrodeck.appdata.xml net.retrodeck.retrodeck.appdata.xml.bak
 cp net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml.bak
 
-if [[ -f "net.retrodeck.retrodeck.cached.yml" ]]; then
-    read -rp "A cached manifest file with placeholder substitutions already exists. Do you want to use it? [y/N] " use_cached
-    if [[ "${use_cached,,}" == "y" ]]; then
-        mv -f net.retrodeck.retrodeck.cached.yml net.retrodeck.retrodeck.yml
-    else
-        use_cached="n"
-    fi
-else
-    use_cached="n"
-fi
-
-export use_cached
-
 automation_tools/install_dependencies.sh
 automation_tools/cooker_build_id.sh
 automation_tools/pre_build_automation.sh