diff --git a/source/gamemodes/prophuntextended/gamemode/server/states/state_postround.lua b/source/gamemodes/prophuntextended/gamemode/server/states/state_postround.lua
index 17d67bf..b8fb9e6 100644
--- a/source/gamemodes/prophuntextended/gamemode/server/states/state_postround.lua
+++ b/source/gamemodes/prophuntextended/gamemode/server/states/state_postround.lua
@@ -109,21 +109,11 @@ function CLASS:Tick()
 		
 		-- Team Distribution Logic
 		local hiders, seekers = {}, {}
-		if (GAMEMODE.Config:GameType() == GAMEMODE.Types.Original) then
-			-- Game Mode: Basic
-			local plyCount, finalPlyCount = #players, math.max(math.ceil(#players / 2), 1)
-			for c = 1,finalPlyCount do
-				seekers[c] = table.remove(players, 1)
-			end
-			hiders = players
-		elseif (GAMEMODE.Config:GameType() == GAMEMODE.Types.TheDeadHunt) then
-			-- Game Mode: The Dead Hunt
-			local plyCount, finalPlyCount = #players, math.max(math.ceil(#players * GAMEMODE.Config.Teams:SeekerPercentage()), 1)
-			for c = 1,finalPlyCount do
-				seekers[c] = table.remove(players, 1)
-			end
-			hiders = players
+		local plyCount, finalPlyCount = #players, math.max(math.ceil(#players / 2), 1)
+		for c = 1,finalPlyCount do
+			seekers[c] = table.remove(players, 1)
 		end
+		hiders = players
 		
 		-- Kill & Assign Teams
 		for i, ply in ipairs(hiders) do
diff --git a/source/gamemodes/prophuntextended/gamemode/server/states/state_prematch.lua b/source/gamemodes/prophuntextended/gamemode/server/states/state_prematch.lua
index 8ea0eec..5f4400f 100644
--- a/source/gamemodes/prophuntextended/gamemode/server/states/state_prematch.lua
+++ b/source/gamemodes/prophuntextended/gamemode/server/states/state_prematch.lua
@@ -40,14 +40,10 @@ function CLASS:Tick()
 		RoundManager:SetState(StatePreRound)
 	end
 	
-	-- Game Mode: Basic
-	if (GAMEMODE.Config:GameType() == GAMEMODE.Types.Original) then
-		-- Both Teams must have at least 1 player.
-		if ((team.NumPlayers(GAMEMODE.Teams.Seekers) >= 1) && (team.NumPlayers(GAMEMODE.Teams.Hiders) >= 1)) then
-			RoundManager:SetState(StatePreRound)
-			if GAMEMODE.Config:DebugLog() then print("StatePreMatch: <Original> Have enough players to start match.") end
-		end
-	-- TODO: Other Gamemodes
+	-- Both Teams must have at least 1 player.
+	if ((team.NumPlayers(GAMEMODE.Teams.Seekers) >= 1) && (team.NumPlayers(GAMEMODE.Teams.Hiders) >= 1)) then
+		RoundManager:SetState(StatePreRound)
+		if GAMEMODE.Config:DebugLog() then print("StatePreMatch: <Original> Have enough players to start match.") end
 	end
 end