diff --git a/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/settings.java b/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/settings.java
deleted file mode 100644
index 3c4f5cb1..00000000
--- a/RaceTimer/racetimer_endpoints/src/main/java/DataMapper/settings.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package DataMapper;
-
-/**
- *
- * @author Christian
- */
-public class settings {
-    static String racetimerURL = "jdbc:mysql://localhost:3306/unloze_racetimer_css?useLegacyDatetimeCode=false&serverTimezone=UTC";
-    static String racetimerUser = "unloze_racetimer_css";
-    static String racetimerPassword = "fXPWQD13403rfnfdsfnFONF";
-    
-    static String forumURL = "jdbc:mysql://195.154.53.196:3306/unloze_forum_2?useLegacyDatetimeCode=false&serverTimezone=UTC";
-    static String forumUser = "unloze_webtimer";
-    static String forumPassword = "Oj32n4nfofn234nfb234oFDOWq";
-}
diff --git a/RaceTimer/scripting/unloze_racetimer_redux.sp b/RaceTimer/scripting/unloze_racetimer_redux.sp
index 4e8b16f4..7646b43d 100644
--- a/RaceTimer/scripting/unloze_racetimer_redux.sp
+++ b/RaceTimer/scripting/unloze_racetimer_redux.sp
@@ -281,14 +281,20 @@ public void Event_RoundStart(Handle event, const char[] name, bool dontBroadcast
             g_bhumans_finished[i] = false;
             resetClientVectors(i);
             g_bAllowToLeave[i] = 0;
+            char first_zone[512];
+            ZoneNameBasedOnIndex(0, first_zone);
             if (race_zone_count != 1)
                 g_bHumansAllowedTime[i] = false;
-            else
+            else if (StrContains(first_zone, "ZONE_PREFIX_RACE") > -1) //ensures only one zone in total and that its the actual end zone
             {
                 mysql_get_player_time(i, 0);
                 g_bHumansAllowedTime[i] = true;
                 g_fStartTime[i] = GetEngineTime();
             }
+            else
+            {
+                g_bHumansAllowedTime[i] = false;
+            }
         }
 }
 //----------------------------------------------------------------------------------------------------
@@ -534,6 +540,7 @@ public void unloze_zoneLeave(int client, char[] zone)
 
     if (GetClientTeam(client) == CS_TEAM_CT)
     {
+        //PrintToChatAll("Equal: %i", StrEqual(zone, g_cSpecialMapStart));
         if ((StrContains(zone, "ZONE_PREFIX_START") > -1) || StrEqual(zone, g_cSpecialMapStart))
         {
             char sAuthID[32];