diff --git a/scripting/shavit-hud.sp b/scripting/shavit-hud.sp
index 41896500..2d391017 100644
--- a/scripting/shavit-hud.sp
+++ b/scripting/shavit-hud.sp
@@ -439,7 +439,7 @@ public void UpdateHUD(int client)
 
 				if(bStarted)
 				{
-					Format(sHintText, 512, "%s\nJumps: %d\t\tStyle: <font color='#%s'>%s</font>", sHintText, iJumps, gS_StyleHTMLColors[bsStyle], gS_BhopStyles[bsStyle]);
+					Format(sHintText, 512, "%s\nJumps: %d%s\tStyle: <font color='#%s'>%s</font>", sHintText, iJumps, (iJumps < 1000)? "\t":"", gS_StyleHTMLColors[bsStyle], gS_BhopStyles[bsStyle]);
 				}
 
 				else
diff --git a/scripting/shavit-misc.sp b/scripting/shavit-misc.sp
index 794564dd..1671a930 100644
--- a/scripting/shavit-misc.sp
+++ b/scripting/shavit-misc.sp
@@ -63,9 +63,6 @@ ConVar gCV_AutoRespawn = null;
 ConVar gCV_CreateSpawnPoints = null;
 ConVar gCV_DisableRadio = null;
 
-// game cvars
-ConVar mp_ignore_round_win_conditions = null;
-
 // dhooks
 Handle gH_GetMaxPlayerSpeed = null;
 
@@ -144,9 +141,6 @@ public void OnPluginStart()
 
 	AutoExecConfig();
 
-	// game cvars
-	mp_ignore_round_win_conditions = FindConVar("mp_ignore_round_win_conditions");
-
 	if(LibraryExists("dhooks"))
 	{
 		Handle hGameData = LoadGameConfigFile("shavit.games");
@@ -175,8 +169,6 @@ public void OnPluginStart()
 
 public void OnMapStart()
 {
-	CS_TerminateRound(10.0, CSRoundEnd_GameStart, true);
-
 	if(gCV_CreateSpawnPoints.BoolValue)
 	{
 		int iEntity = -1;
@@ -832,15 +824,3 @@ public Action Player_Notifications(Event event, const char[] name, bool dontBroa
 
 	return Plugin_Continue;
 }
-
-public Action CS_OnTerminateRound(float &delay, CSRoundEndReason &reason)
-{
-	int iTimeLeft = 0;
-
-	if(mp_ignore_round_win_conditions.BoolValue || (reason == CSRoundEnd_GameStart && GetMapTimeLeft(iTimeLeft) && iTimeLeft > 1 && (gCV_RespawnOnTeam.BoolValue || gCV_RespawnOnRestart.BoolValue)))
-	{
-		return Plugin_Handled;
-	}
-
-	return Plugin_Continue;
-}