diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index 964497ac..2b371fe2 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -289,31 +289,7 @@ namespace VEPROMS
             // cleanup from previous run:
             TmpFile.RemoveAllTmps();
 
-			if (VlnSettings.DebugMode)
-			{
-				//use local data (for development/debug mode)
-				if (Environment.MachineName == "RMARK-PC")
-                    Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
-				else if (Environment.MachineName == "WINDOWS7-RHM")
-                    Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
-				else if (Environment.UserName.ToUpper() == "BODINE")
-                    Database.ConnectionName = "VEPROMS_BODINE_DEBUG";
-				else
-                    Database.ConnectionName = "VEPROMS_LOCAL";
-			}
-			else
-			{
-				// use server data (default)
-				// - except for the volian laptop and Rich's Demo version where we need to use local data
-				if (Environment.MachineName == "RMARK-PC")
-                    Database.ConnectionName = "VEPROMS_RMARK_DEMO";
-				else if (Environment.MachineName == "WINDOWS7-RHM")
-                    Database.ConnectionName = "VEPROMS_RMARK_DEMO";
-				else if (Environment.UserName.ToUpper() == "BODINE")
-                    Database.ConnectionName = "VEPROMS_BODINE_DEMO";
-				else
-                    Database.ConnectionName = "VEPROMS_LOCAL";
-			}
+			Database.ConnectionName = "VEPROMS_LOCAL";
 
 			InitializeComponent();