diff --git a/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc b/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc
index 31a9f8e..7cfc162 100644
--- a/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc
+++ b/iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc
@@ -1132,15 +1132,17 @@ Callback_PlayerConnect()
 	{
 		setMatchData( "playerCount", game["clientid"] );
 		setMatchData( "players", self.clientid, "xuid", self getXuid() );
-		/#
-		if ( ( getDvarInt( "scr_forcerankedmatch" ) && level.teamBased ) || ( isDefined( self.pers["isBot"] ) && level.teamBased ) )
-			self.sessionteam = maps\mp\gametypes\_menus::getTeamAssignment();
-		#/		
-		assert( getdvarint( "scr_runlevelandquit" ) == 1 || (level.teamBased && (self.sessionteam == "allies" || self.sessionteam == "axis")) || (!level.teamBased && self.sessionteam == "none" ) );
-		//assert( (level.teamBased && self.sessionteam == self.team) || (!level.teamBased && self.sessionteam == "none") );
 		
-		if ( matchMakingGame() && allowTeamChoice() )
+		if( matchMakingGame() && allowTeamChoice() )
+		{
+			/#
+			if ( ( getDvarInt( "scr_forcerankedmatch" ) && level.teamBased ) || ( isDefined( self.pers["isBot"] ) && level.teamBased ) )
+				self.sessionteam = maps\mp\gametypes\_menus::getTeamAssignment();
+			#/		
+			assert( getdvarint( "scr_runlevelandquit" ) == 1 || (level.teamBased && (self.sessionteam == "allies" || self.sessionteam == "axis")) || (!level.teamBased && self.sessionteam == "none" ) );
+			//assert( (level.teamBased && self.sessionteam == self.team) || (!level.teamBased && self.sessionteam == "none") );
 			setMatchData( "players", self.clientid, "team", self.sessionteam );
+		}	
 	}
 
 	if ( !level.teamBased )
diff --git a/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc b/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc
index db8fda5..b35ad06 100644
--- a/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc
+++ b/iw4x/iw4x_00/maps/mp/gametypes/conf.gsc
@@ -259,11 +259,7 @@ onUse( player )
 	//	friendly pickup
 	if ( player.pers["team"] == self.victimTeam )
 	{
-		self.trigger playSound( "mp_killconfirm_tags_deny" );
-		
-		player incPlayerStat( "killsdenied", 1 );
-		player incPersStat( "denied", 1 );
-		player maps\mp\gametypes\_persistence::statSetChild( "round", "denied", player.pers["denied"] );
+		self.trigger playSound( "mp_killconfirm_tags_deny" );	
 			
 		if ( self.victim == player )
 		{
@@ -288,10 +284,6 @@ onUse( player )
 		event = "kill_confirmed";
 		splash = &"SPLASHES_KILL_CONFIRMED";
 		
-		player incPlayerStat( "killsconfirmed", 1 );
-		player incPersStat( "confirmed", 1 );
-		player maps\mp\gametypes\_persistence::statSetChild( "round", "confirmed", player.pers["confirmed"] );
-		
 		//	if not us, tell the attacker their kill was confirmed
 		if ( self.attacker != player )
 			self.attacker onPickup( event, splash );
@@ -308,13 +300,13 @@ onUse( player )
 }
 
 
-onPickup( event, splash, stat )
+onPickup( event, splash )
 {
 	level endon( "game_ended" );
 	self  endon( "disconnect" );
 	
 	self thread EventPopup( splash );
-	maps\mp\gametypes\_gamescore::givePlayerScore( event, self, undefined, true );
+	maps\mp\gametypes\_gamescore::givePlayerScore( event, self );
 	self thread maps\mp\gametypes\_rank::giveRankXP( event );
 }
 
@@ -334,7 +326,6 @@ resetTags()
 }
 
 
-
 bounce()
 {
 	level endon( "game_ended" );