diff --git a/engine/common/base_cmd.h b/engine/common/base_cmd.h
index 8faf06c9..9b68e848 100644
--- a/engine/common/base_cmd.h
+++ b/engine/common/base_cmd.h
@@ -12,15 +12,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 */
-
-#pragma once
 #ifndef BASE_CMD_H
 #define BASE_CMD_H
 
-#define XASH_HASHED_VARS
-
-#ifdef XASH_HASHED_VARS
-
 #include "common.h"
 #include "cdll_int.h"
 
@@ -38,11 +32,9 @@ void BaseCmd_Init( void );
 void BaseCmd_Shutdown( void );
 base_command_t *BaseCmd_Find( base_command_type_e type, const char *name );
 void BaseCmd_FindAll( const char *name, cmd_t **cmd, cmdalias_t **alias, convar_t **cvar );
-void BaseCmd_Insert ( base_command_type_e type, base_command_t *basecmd, const char *name );
-void BaseCmd_Remove ( base_command_type_e type, const char *name );
+void BaseCmd_Insert( base_command_type_e type, base_command_t *basecmd, const char *name );
+void BaseCmd_Remove( base_command_type_e type, const char *name );
 void BaseCmd_Stats_f( void ); // to be registered later
 void BaseCmd_Test_f( void ); // to be registered later
 
-#endif // XASH_HASHED_VARS
-
 #endif // BASE_CMD_H
diff --git a/engine/common/cmd.c b/engine/common/cmd.c
index 29f5e3ec..4baf34f7 100644
--- a/engine/common/cmd.c
+++ b/engine/common/cmd.c
@@ -453,9 +453,7 @@ static void Cmd_Alias_f( void )
 		else cmd_alias = a;
 		a->next = cur;
 
-#if defined( XASH_HASHED_VARS )
 		BaseCmd_Insert( HM_CMDALIAS, a, a->name );
-#endif
 	}
 
 	// copy the rest of the command line
@@ -501,9 +499,7 @@ static void Cmd_UnAlias_f ( void )
 		{
 			if( !Q_strcmp( s, a->name ))
 			{
-#if defined( XASH_HASHED_VARS )
 				BaseCmd_Remove( HM_CMDALIAS, a->name );
-#endif
 				if( a == cmd_alias )
 					cmd_alias = a->next;
 				if( p ) p->next = a->next;
@@ -705,9 +701,7 @@ int Cmd_AddCommandEx( const char *cmd_name, xcommand_t function, const char *cmd
 	else cmd_functions = cmd;
 	cmd->next = cur;
 
-#if defined(XASH_HASHED_VARS)
 	BaseCmd_Insert( HM_CMD, cmd, cmd->name );
-#endif
 
 	return 1;
 }
@@ -732,9 +726,7 @@ void GAME_EXPORT Cmd_RemoveCommand( const char *cmd_name )
 
 		if( !Q_strcmp( cmd_name, cmd->name ))
 		{
-#if defined(XASH_HASHED_VARS)
 			BaseCmd_Remove( HM_CMD, cmd->name );
-#endif
 
 			*back = cmd->next;
 
@@ -779,17 +771,7 @@ Cmd_Exists
 */
 cmd_t *Cmd_Exists( const char *cmd_name )
 {
-#if defined(XASH_HASHED_VARS)
 	return BaseCmd_Find( HM_CMD, cmd_name );
-#else
-	cmd_t	*cmd;
-	for( cmd = cmd_functions; cmd; cmd = cmd->next )
-	{
-		if( !Q_strcmp( cmd_name, cmd->name ))
-			return cmd;
-	}
-	return NULL;
-#endif
 }
 
 /*
@@ -960,21 +942,10 @@ static void Cmd_ExecuteStringWithPrivilegeCheck( const char *text, qboolean isPr
 
 	if( !Cmd_Argc( )) return; // no tokens
 
-#if defined( XASH_HASHED_VARS )
 	BaseCmd_FindAll( cmd_argv[0], &cmd, &a, &cvar );
-#endif
 
 	if( !host.apply_game_config )
 	{
-#if !defined( XASH_HASHED_VARS )
-		// check aliases
-		for( a = cmd_alias; a; a = a->next )
-		{
-			if( !Q_stricmp( cmd_argv[0], a->name ))
-				break;
-		}
-#endif
-
 		if( a )
 		{
 			size_t len = Q_strlen( a->value );
@@ -988,14 +959,6 @@ static void Cmd_ExecuteStringWithPrivilegeCheck( const char *text, qboolean isPr
 	// special mode for restore game.dll archived cvars
 	if( !host.apply_game_config || !Q_strcmp( cmd_argv[0], "exec" ))
 	{
-#if !defined( XASH_HASHED_VARS )
-		for( cmd = cmd_functions; cmd; cmd = cmd->next )
-		{
-			if( !Q_stricmp( cmd_argv[0], cmd->name ) && cmd->function )
-				break;
-		}
-#endif
-
 		// check functions
 		if( cmd && cmd->function )
 		{
@@ -1152,9 +1115,7 @@ void Cmd_Unlink( int group )
 			continue;
 		}
 
-#if defined(XASH_HASHED_VARS)
 		BaseCmd_Remove( HM_CMD, cmd->name );
-#endif
 
 		*prev = cmd->next;
 
@@ -1273,12 +1234,7 @@ static void Cmd_MakePrivileged_f( void )
 		return;
 	}
 
-#if defined( XASH_HASHED_VARS )
 	BaseCmd_FindAll( s, &cmd, &alias, &cv );
-#else
-	cmd = Cmd_Exists( s );
-	cv = Cvar_FindVar( s );
-#endif
 
 	if( !cv && !cmd )
 	{
@@ -1363,10 +1319,8 @@ void Cmd_Init( void )
 
 	Cmd_AddRestrictedCommand( "make_privileged", Cmd_MakePrivileged_f, "makes command or variable privileged (protected from access attempts from server)" );
 
-#if defined(XASH_HASHED_VARS)
 	Cmd_AddCommand( "basecmd_stats", BaseCmd_Stats_f, "print info about basecmd usage" );
 	Cmd_AddCommand( "basecmd_test", BaseCmd_Test_f, "test basecmd" );
-#endif
 }
 
 void Cmd_Shutdown( void )
diff --git a/engine/common/cvar.c b/engine/common/cvar.c
index dac7c880..351dea8c 100644
--- a/engine/common/cvar.c
+++ b/engine/common/cvar.c
@@ -76,18 +76,7 @@ convar_t *Cvar_FindVar( const char *var_name )
 	if( !var_name )
 		return NULL;
 
-#if defined(XASH_HASHED_VARS) // TODO: ignore_group
 	var = BaseCmd_Find( HM_CVAR, var_name );
-#else
-	for( var = cvar_vars; var; var = var->next )
-	{
-		if( ignore_group && FBitSet( ignore_group, var->flags ))
-			continue;
-
-		if( !Q_stricmp( var_name, var->name ))
-			return var;
-	}
-#endif
 
 	// HACKHACK: HL25 compatibility
 	if( !var && !Q_stricmp( var_name, "gl_widescreen_yfov" ))
@@ -319,9 +308,7 @@ static int Cvar_UnlinkVar( const char *var_name, uint32_t group )
 			continue;
 		}
 
-#if defined(XASH_HASHED_VARS)
 		BaseCmd_Remove( HM_CVAR, var->name );
-#endif
 
 		// unlink variable from list
 		*prev = var->next;
@@ -487,10 +474,8 @@ convar_t *Cvar_Get( const char *name, const char *value, uint32_t flags, const c
 	// tell engine about changes
 	Cvar_Changed( var );
 
-#if defined(XASH_HASHED_VARS)
 	// add to map
 	BaseCmd_Insert( HM_CVAR, var, var->name );
-#endif
 
 	return var;
 }
@@ -575,10 +560,8 @@ void Cvar_RegisterVariable( convar_t *var )
 	// tell engine about changes
 	Cvar_Changed( var );
 
-#if defined(XASH_HASHED_VARS)
 	// add to map
 	BaseCmd_Insert( HM_CVAR, var, var->name );
-#endif
 }
 
 static qboolean Cvar_CanSet( const convar_t *cv )
@@ -1024,11 +1007,6 @@ qboolean Cvar_CommandWithPrivilegeCheck( convar_t *v, qboolean isPrivileged )
 		return true;
 	}
 
-#if !defined( XASH_HASHED_VARS )
-	// check variables
-	v = Cvar_FindVar( Cmd_Argv( 0 ));
-#endif
-
 	if( !v )
 		return false;