diff --git a/src/k_collide.c b/src/k_collide.c
index 5aa6c2f5a..0298c0dff 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -770,20 +770,6 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
 			return true;
 		}
 	}
-
-	// Ring Loss on bump.
-	t1Condition = ((t2->player->rings > 0) && (K_GetShieldFromPlayer(t2->player) == KSHIELD_NONE));
-	t2Condition = ((t1->player->rings > 0) && (K_GetShieldFromPlayer(t1->player) == KSHIELD_NONE));
-
-	if (t1Condition == true)
-	{
-		P_PlayerRingBurst(t2->player, 1);
-	}
-
-	if (t2Condition == true)
-	{
-		P_PlayerRingBurst(t1->player, 1);
-	}
 	
 	return false;
 }
diff --git a/src/k_kart.c b/src/k_kart.c
index d836564ca..74a93d535 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2050,6 +2050,12 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol
 		mobj1->player->rmomy = mobj1->momy - mobj1->player->cmomy;
 		mobj1->player->justbumped = bumptime;
 
+		// Moved here so it only fires once on bump.
+		if ((mobj1->player->rings > 0) && (K_GetShieldFromPlayer(mobj1->player) == KSHIELD_NONE))
+		{
+			P_PlayerRingBurst(mobj1->player, 1);
+		}
+
 		if (mobj1->player->spinouttimer)
 		{
 			mobj1->player->wipeoutslow = wipeoutslowtime+1;
@@ -2064,6 +2070,12 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol
 		mobj2->player->rmomy = mobj2->momy - mobj2->player->cmomy;
 		mobj2->player->justbumped = bumptime;
 
+		// Moved here so it only fires once on bump.
+		if ((mobj2->player->rings > 0) && (K_GetShieldFromPlayer(mobj2->player) == KSHIELD_NONE))
+		{
+			P_PlayerRingBurst(mobj2->player, 1);
+		}
+
 		if (mobj2->player->spinouttimer)
 		{
 			mobj2->player->wipeoutslow = wipeoutslowtime+1;
diff --git a/src/y_inter.c b/src/y_inter.c
index ff5fd17db..a1ee5c111 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -777,15 +777,9 @@ skiptallydrawer:
 			break;
 		}
 
-	//if ((intertic/TICRATE) & 1) // Make it obvious that scrambling is happening next round. (OR NOT, I GUESS)
-	//{
-		/*if (cv_scrambleonchange.value && cv_teamscramble.value)
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, hilicol, M_GetText("Teams will be scrambled next round!"));*/
-
-		if (speedscramble != -1 && speedscramble != gamespeed)
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, hilicol|V_ALLOWLOWERCASE|V_SNAPTOBOTTOM,
-				va(M_GetText("Next race will be %s Speed!"), kartspeed_cons_t[1+speedscramble].strvalue));
-	//}
+	if ((speedscramble != -1) && (speedscramble != gamespeed))
+		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, hilicol|V_ALLOWLOWERCASE|V_SNAPTOBOTTOM,
+			va(M_GetText("Next race will be %s Speed!"), kartspeed_cons_t[1+speedscramble].strvalue));
 }
 
 //