diff --git a/Ghidra/Framework/Utility/src/main/java/utility/application/AppCleaner.java b/Ghidra/Framework/Utility/src/main/java/utility/application/AppCleaner.java
index b569cafaa4..f87af85c63 100644
--- a/Ghidra/Framework/Utility/src/main/java/utility/application/AppCleaner.java
+++ b/Ghidra/Framework/Utility/src/main/java/utility/application/AppCleaner.java
@@ -246,7 +246,9 @@ public class AppCleaner implements GhidraLaunchable {
 		getDirFromProperty(PROPERTY_TEMP_DIR, appName).ifPresent(discoveredDirs::add);
 		getDirFromProperty(PROPERTY_TEMP_DIR, userNameAndAppName).ifPresent(discoveredDirs::add);
 
-		// XDG environment variable override
+		// XDG environment variable override.
+		// This was used briefly in the master branch and then removed, so some users might have 
+		// this artifact. We can eventually stop looking here.
 		getDirFromEnv(XDG_RUNTIME_DIR, appName).ifPresent(discoveredDirs::add);
 		getDirFromEnv(XDG_RUNTIME_DIR, userNameAndAppName).ifPresent(discoveredDirs::add);
 
diff --git a/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java b/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
index bffd703e05..635c64b483 100644
--- a/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
+++ b/Ghidra/Framework/Utility/src/main/java/utility/application/ApplicationUtilities.java
@@ -176,13 +176,6 @@ public class ApplicationUtilities {
 				new File(tempOverrideDir, getUserSpecificDirName(tempOverrideDir, appName)));
 		}
 
-		// Look for XDG environment variable
-		File xdgRuntimeDir = getEnvFile(XdgUtils.XDG_RUNTIME_DIR, false);
-		if (xdgRuntimeDir != null) {
-			return createDir(
-				new File(xdgRuntimeDir, getUserSpecificDirName(xdgRuntimeDir, appName)));
-		}
-
 		File javaTmpDir = getJavaTmpDir();
 		return createDir(new File(getJavaTmpDir(), getUserSpecificDirName(javaTmpDir, appName)));
 	}
diff --git a/Ghidra/RuntimeScripts/Common/support/launch.properties b/Ghidra/RuntimeScripts/Common/support/launch.properties
index 19418675dd..46a4e14060 100644
--- a/Ghidra/RuntimeScripts/Common/support/launch.properties
+++ b/Ghidra/RuntimeScripts/Common/support/launch.properties
@@ -116,8 +116,7 @@ VMARGS=-Xshare:off
 # directory lives outside of the user's home directory.  The temporary directory will be selected 
 # based on the following rules, in order of precedence:
 # 1. System.getProperty("application.tempdir")/[user-]<application>
-# 2. System.getenv("XDG_RUNTIME_DIR")/[user-]<application>
-# 3. System.getProperty("java.io.tmpdir")/[user-]<application>
+# 2. System.getProperty("java.io.tmpdir")/[user-]<application>
 # Unless overridden below, the "java.io.tmpdir" system property typically defaults to the following
 # platform specific locations:
 #  - Windows: %TEMP%