diff --git a/dlls/Android.mk b/dlls/Android.mk
index 6535317a..8bb92883 100644
--- a/dlls/Android.mk
+++ b/dlls/Android.mk
@@ -128,8 +128,8 @@ LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
 		   gravgun.cpp \
 	   ../pm_shared/pm_debug.c \
 	   ../pm_shared/pm_math.c \
-	   ../pm_shared/pm_shared.c \
-	   ../game_shared/voice_gamemgr.cpp
+	   ../pm_shared/pm_shared.c
+#	   ../game_shared/voice_gamemgr.cpp
 
 LOCAL_LDLIBS := -llog
 
diff --git a/dlls/client.cpp b/dlls/client.cpp
index f17b6e54..5d51f1ed 100644
--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@@ -102,7 +102,7 @@ void ClientDisconnect( edict_t *pEntity )
 		return;
 
 	char text[256] = "";
-	if ( pEntity->v.netname )
+	if ( pEntity->v.netname )
 	    snprintf( text, sizeof(text), "- %s has left the game\n", STRING(pEntity->v.netname) );
 	MESSAGE_BEGIN( MSG_ALL, gmsgSayText, NULL );
 		WRITE_BYTE( ENTINDEX(pEntity) );
@@ -198,14 +198,14 @@ void ClientPutInServer( edict_t *pEntity )
 
 	// Reset interpolation during first frame
 	pPlayer->pev->effects |= EF_NOINTERP;
-
-	pPlayer->pev->iuser1 = 0;
-	pPlayer->pev->iuser2 = 0;
-
+
+	pPlayer->pev->iuser1 = 0;
+	pPlayer->pev->iuser2 = 0;
+
 }
 
-#include "voice_gamemgr.h"
-extern CVoiceGameMgr g_VoiceGameMgr;
+//#include "voice_gamemgr.h"
+//extern CVoiceGameMgr g_VoiceGameMgr;
 
 //// HOST_SAY
 // String comes in as
@@ -314,8 +314,8 @@ void Host_Say( edict_t *pEntity, int teamonly )
 			continue;
 
 		// can the receiver hear the sender? or has he muted him?
-		if ( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) )
-			continue;
+		//if ( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) )
+			//continue;
 
 		if ( teamonly && g_pGameRules->PlayerRelationship(client, CBaseEntity::Instance(pEntity)) != GR_TEAMMATE )
 			continue;
diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp
index 9f4093f5..c520ce8d 100644
--- a/dlls/multiplay_gamerules.cpp
+++ b/dlls/multiplay_gamerules.cpp
@@ -43,7 +43,7 @@ extern int g_teamplay;
 
 float g_flIntermissionStartTime = 0;
 
-CVoiceGameMgr	g_VoiceGameMgr;
+//CVoiceGameMgr	g_VoiceGameMgr;
 
 class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper
 {
@@ -69,7 +69,7 @@ static CMultiplayGameMgrHelper g_GameMgrHelper;
 
 CHalfLifeMultiplay :: CHalfLifeMultiplay()
 {
-	g_VoiceGameMgr.Init(&g_GameMgrHelper, gpGlobals->maxClients);
+	//g_VoiceGameMgr.Init(&g_GameMgrHelper, gpGlobals->maxClients);
 
 	RefreshSkillData();
 	m_flIntermissionEndTime = 0;
@@ -116,8 +116,8 @@ CHalfLifeMultiplay :: CHalfLifeMultiplay()
 
 BOOL CHalfLifeMultiplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
 {
-	if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
-		return TRUE;
+	//if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
+		//return TRUE;
 
 	return CGameRules::ClientCommand(pPlayer, pcmd);
 }
@@ -186,7 +186,7 @@ extern cvar_t mp_chattime;
 //=========================================================
 void CHalfLifeMultiplay :: Think ( void )
 {
-	g_VoiceGameMgr.Update(gpGlobals->frametime);
+	//g_VoiceGameMgr.Update(gpGlobals->frametime);
 
 	///// Check game rules /////
 	static int last_frags;
@@ -397,7 +397,7 @@ BOOL CHalfLifeMultiplay :: GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerI
 //=========================================================
 BOOL CHalfLifeMultiplay :: ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ] )
 {
-	g_VoiceGameMgr.ClientConnected(pEntity);
+	//g_VoiceGameMgr.ClientConnected(pEntity);
 	return TRUE;
 }
 
diff --git a/dlls/teamplay_gamerules.cpp b/dlls/teamplay_gamerules.cpp
index db99778f..2bad4c35 100644
--- a/dlls/teamplay_gamerules.cpp
+++ b/dlls/teamplay_gamerules.cpp
@@ -69,7 +69,7 @@ CHalfLifeTeamplay :: CHalfLifeTeamplay()
 extern cvar_t timeleft, fragsleft;
 
 #include "voice_gamemgr.h"
-extern CVoiceGameMgr	g_VoiceGameMgr;
+//extern CVoiceGameMgr	g_VoiceGameMgr;
 
 void CHalfLifeTeamplay :: Think ( void )
 {
@@ -80,7 +80,7 @@ void CHalfLifeTeamplay :: Think ( void )
 	int frags_remaining = 0;
 	int time_remaining = 0;
 
-	g_VoiceGameMgr.Update(gpGlobals->frametime);
+	//g_VoiceGameMgr.Update(gpGlobals->frametime);
 
 	if ( g_fGameOver )   // someone else quit the game already
 	{
@@ -145,8 +145,8 @@ void CHalfLifeTeamplay :: Think ( void )
 //=========================================================
 BOOL CHalfLifeTeamplay :: ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
 {
-	if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
-		return TRUE;
+	//if(g_VoiceGameMgr.ClientCommand(pPlayer, pcmd))
+		//return TRUE;
 
 	if ( FStrEq( pcmd, "menuselect" ) )
 	{