diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/npscalc.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/npscalc.lua
index 990db949d3..bfc803be5b 100644
--- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/npscalc.lua	
+++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/npscalc.lua	
@@ -6,13 +6,10 @@ local allowedCustomization = playerConfig:get_data(pn_to_profile_slot(PLAYER_1))
 local enabled = {
 	NPSDisplay = {
 		PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and
-			playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSDisplay,
-		PlayerNumber_P2 = GAMESTATE:IsPlayerEnabled(PLAYER_2) and
-			playerConfig:get_data(pn_to_profile_slot(PLAYER_2)).NPSDisplay
+			playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSDisplay
 	},
 	NPSGraph = {
-		PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSGraph,
-		PlayerNumber_P2 = GAMESTATE:IsPlayerEnabled(PLAYER_2) and playerConfig:get_data(pn_to_profile_slot(PLAYER_2)).NPSGraph
+		PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSGraph
 	}
 }
 
diff --git a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua
index abcc80b74e..b79b8e2e6c 100644
--- a/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua	
+++ b/Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua	
@@ -8,11 +8,6 @@ local function input(event)
 					SCREENMAN:AddNewScreenToTop("ScreenAvatarSwitch")
 				end
 			end
-			if GAMESTATE:IsPlayerEnabled(PLAYER_2) then
-				if isOver(top:GetChild("Overlay"):GetChild("PlayerAvatar"):GetChild("Avatar" .. PLAYER_2):GetChild("Image")) then
-					SCREENMAN:AddNewScreenToTop("ScreenAvatarSwitch")
-				end
-			end
 		end
 	end
 	return false