diff --git a/dmc/cl_dll/util.h b/dmc/cl_dll/util.h
deleted file mode 100644
index 2a7ff20..0000000
--- a/dmc/cl_dll/util.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/***
-*
-*	Copyright (c) 1996-2002, Valve LLC. All rights reserved.
-*	
-*	This product contains software technology licensed from Id 
-*	Software, Inc. ("Id Technology").  Id Technology (c) 1996 Id Software, Inc. 
-*	All Rights Reserved.
-*
-*   Use, distribution, and modification of this source code and/or resulting
-*   object code is restricted to non-commercial enhancements to products from
-*   Valve LLC.  All other use, distribution, or modification is prohibited
-*   without written permission from Valve LLC.
-*
-****/
-//
-// util.h
-//
-
-#include "cvardef.h"
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-
-// Macros to hook function calls into the HUD object
-#define HOOK_MESSAGE(x) gEngfuncs.pfnHookUserMsg(#x, __MsgFunc_##x );
-
-#define DECLARE_MESSAGE(y, x) int __MsgFunc_##x(const char *pszName, int iSize, void *pbuf) \
-							{ \
-							return gHUD.##y.MsgFunc_##x(pszName, iSize, pbuf ); \
-							}
-
-
-#define HOOK_COMMAND(x, y) gEngfuncs.pfnAddCommand( x, __CmdFunc_##y );
-#define DECLARE_COMMAND(y, x) void __CmdFunc_##x( void ) \
-							{ \
-								gHUD.##y.UserCmd_##x( ); \
-							}
-
-inline float CVAR_GET_FLOAT( const char *x ) {	return gEngfuncs.pfnGetCvarFloat( (char*)x ); }
-inline char* CVAR_GET_STRING( const char *x ) {	return gEngfuncs.pfnGetCvarString( (char*)x ); }
-inline struct cvar_s *CVAR_CREATE( const char *cv, const char *val, const int flags ) {	return gEngfuncs.pfnRegisterVariable( (char*)cv, (char*)val, flags ); }
-
-#define SPR_Load (*gEngfuncs.pfnSPR_Load)
-#define SPR_Set (*gEngfuncs.pfnSPR_Set)
-#define SPR_Frames (*gEngfuncs.pfnSPR_Frames)
-#define SPR_GetList (*gEngfuncs.pfnSPR_GetList)
-
-// SPR_Draw  draws a the current sprite as solid
-#define SPR_Draw (*gEngfuncs.pfnSPR_Draw)
-// SPR_DrawHoles  draws the current sprites,  with color index255 not drawn (transparent)
-#define SPR_DrawHoles (*gEngfuncs.pfnSPR_DrawHoles)
-// SPR_DrawAdditive  adds the sprites RGB values to the background  (additive transulency)
-#define SPR_DrawAdditive (*gEngfuncs.pfnSPR_DrawAdditive)
-
-// SPR_EnableScissor  sets a clipping rect for HUD sprites.  (0,0) is the top-left hand corner of the screen.
-#define SPR_EnableScissor (*gEngfuncs.pfnSPR_EnableScissor)
-// SPR_DisableScissor  disables the clipping rect
-#define SPR_DisableScissor (*gEngfuncs.pfnSPR_DisableScissor)
-//
-#define FillRGBA (*gEngfuncs.pfnFillRGBA)
-
-
-// ScreenHeight returns the height of the screen, in pixels
-#define ScreenHeight (gHUD.m_scrinfo.iHeight)
-// ScreenWidth returns the width of the screen, in pixels
-#define ScreenWidth (gHUD.m_scrinfo.iWidth)
-
-#define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
-#define ServerCmd (*gEngfuncs.pfnServerCmd)
-#define ClientCmd (*gEngfuncs.pfnClientCmd)
-#define SetCrosshair (*gEngfuncs.pfnSetCrosshair)
-#define AngleVectors (*gEngfuncs.pfnAngleVectors)
-
-
-// Gets the height & width of a sprite,  at the specified frame
-inline int SPR_Height( HSPRITE x, int f )	{ return gEngfuncs.pfnSPR_Height(x, f); }
-inline int SPR_Width( HSPRITE x, int f )	{ return gEngfuncs.pfnSPR_Width(x, f); }
-
-inline 	client_textmessage_t	*TextMessageGet( const char *pName ) { return gEngfuncs.pfnTextMessageGet( pName ); }
-inline 	int						TextMessageDrawChar( int x, int y, int number, int r, int g, int b ) 
-{ 
-	return gEngfuncs.pfnDrawCharacter( x, y, number, r, g, b ); 
-}
-
-inline int DrawConsoleString( int x, int y, const char *string )
-{
-	return gEngfuncs.pfnDrawConsoleString( x, y, (char*) string );
-}
-
-inline void GetConsoleStringSize( const char *string, int *width, int *height )
-{
-	gEngfuncs.pfnDrawConsoleStringLen( string, width, height );
-}
-
-inline int ConsoleStringLen( const char *string )
-{
-	int _width, _height;
-	GetConsoleStringSize( string, &_width, &_height );
-	return _width;
-}
-
-inline void ConsolePrint( const char *string )
-{
-	gEngfuncs.pfnConsolePrint( string );
-}
-
-inline void CenterPrint( const char *string )
-{
-	gEngfuncs.pfnCenterPrint( string );
-}
-
-// returns the players name of entity no.
-#define GetPlayerInfo (*gEngfuncs.pfnGetPlayerInfo)
-
-// sound functions
-inline void PlaySound( char *szSound, float vol ) { gEngfuncs.pfnPlaySoundByName( szSound, vol ); }
-inline void PlaySound( int iSound, float vol ) { gEngfuncs.pfnPlaySoundByIndex( iSound, vol ); }
-
-#define max(a, b)  (((a) > (b)) ? (a) : (b))
-#define min(a, b)  (((a) < (b)) ? (a) : (b))
-#define fabs(x)	   ((x) > 0 ? (x) : 0 - (x))
-
-void ScaleColors( int &r, int &g, int &b, int a );
-
-#define DotProduct(x,y) ((x)[0]*(y)[0]+(x)[1]*(y)[1]+(x)[2]*(y)[2])
-#define VectorSubtract(a,b,c) {(c)[0]=(a)[0]-(b)[0];(c)[1]=(a)[1]-(b)[1];(c)[2]=(a)[2]-(b)[2];}
-#define VectorAdd(a,b,c) {(c)[0]=(a)[0]+(b)[0];(c)[1]=(a)[1]+(b)[1];(c)[2]=(a)[2]+(b)[2];}
-#define VectorCopy(a,b) {(b)[0]=(a)[0];(b)[1]=(a)[1];(b)[2]=(a)[2];}
-#define VectorClear(a) { a[0]=0.0;a[1]=0.0;a[2]=0.0;}
-float Length(const float *v);
-void VectorMA (const float *veca, float scale, const float *vecb, float *vecc);
-void VectorScale (const float *in, float scale, float *out);
-float VectorNormalize (float *v);
-void VectorInverse ( float *v );
-
-extern vec3_t vec3_origin;
-
-// disable 'possible loss of data converting float to int' warning message
-#pragma warning( disable: 4244 )
-// disable 'truncation from 'const double' to 'float' warning message
-#pragma warning( disable: 4305 )
-
-inline void UnpackRGB(int &r, int &g, int &b, unsigned long ulRGB)\
-{\
-	r = (ulRGB & 0xFF0000) >>16;\
-	g = (ulRGB & 0xFF00) >> 8;\
-	b = ulRGB & 0xFF;\
-}
-
-HSPRITE LoadSprite(const char *pszName);
diff --git a/external/SDL2/SDL_config_nintendods.h b/external/SDL2/SDL_config_nintendods.h
deleted file mode 100644
index 7b5c21e..0000000
--- a/external/SDL2/SDL_config_nintendods.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_config_nintendods_h
-#define _SDL_config_nintendods_h
-
-#include "SDL_platform.h"
-
-/* This is a set of defines to configure the SDL features */
-
-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-
-/* LiF: __PTRDIFF_TYPE__ was causing errors of conflicting typedefs with the
-   <stdint.h> shipping with devkitARM.  copied a similar ifdef from it. */
-#ifndef __PTRDIFF_TYPE__
-typedef unsigned long uintptr_t;
-#else
-typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-#endif
-#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
-
-#define SIZEOF_VOIDP 4
-
-/* Useful headers */
-#define HAVE_SYS_TYPES_H	1
-#define HAVE_STDIO_H	1
-#define STDC_HEADERS	1
-#define HAVE_STRING_H	1
-#define HAVE_CTYPE_H	1
-
-/* C library functions */
-#define HAVE_MALLOC	1
-#define HAVE_CALLOC	1
-#define HAVE_REALLOC	1
-#define HAVE_FREE	1
-#define HAVE_ALLOCA	1
-#define HAVE_GETENV	1
-#define HAVE_SETENV	1
-#define HAVE_PUTENV	1
-#define HAVE_QSORT	1
-#define HAVE_ABS	1
-#define HAVE_BCOPY	1
-#define HAVE_MEMSET	1
-#define HAVE_MEMCPY	1
-#define HAVE_MEMMOVE	1
-#define HAVE_MEMCMP	1
-#define HAVE_STRLEN	1
-#define HAVE_STRDUP	1
-#define HAVE_INDEX	1
-#define HAVE_RINDEX	1
-#define HAVE_STRCHR	1
-#define HAVE_STRRCHR	1
-#define HAVE_STRSTR	1
-#define HAVE_STRTOL	1
-#define HAVE_STRTOD	1
-#define HAVE_ATOI	1
-#define HAVE_ATOF	1
-#define HAVE_STRCMP	1
-#define HAVE_STRNCMP	1
-#define HAVE_STRICMP	1
-#define HAVE_STRCASECMP	1
-#define HAVE_SSCANF	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-/* DS isn't that sophisticated */
-#define LACKS_SYS_MMAN_H 1
-
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_NDS	1
-/*#define SDL_AUDIO_DRIVER_DUMMY	1 TODO: uncomment this later*/
-
-/* Enable various input drivers */
-#define SDL_JOYSTICK_NDS	1
-/*#define SDL_JOYSTICK_DUMMY	1 TODO: uncomment this later*/
-
-/* DS has no dynamic linking afaik */
-#define SDL_LOADSO_DISABLED	1
-
-/* Enable various threading systems */
-/*#define SDL_THREAD_NDS	1*/
-#define SDL_THREADS_DISABLED	1
-
-/* Enable various timer systems */
-#define SDL_TIMER_NDS	1
-
-/* Enable various video drivers */
-#define SDL_VIDEO_DRIVER_NDS	1
-#ifdef USE_HW_RENDERER
-#define SDL_VIDEO_RENDER_NDS	1
-#else
-#define SDL_VIDEO_RENDER_NDS	0
-#endif
-
-/* Enable system power support */
-#define SDL_POWER_NINTENDODS 1
-
-/* Enable haptic support */
-#define SDL_HAPTIC_NDS 1
-
-#define SDL_BYTEORDER   SDL_LIL_ENDIAN
-
-#endif /* _SDL_config_nintendods_h */
diff --git a/external/SDL2/SDL_input.h b/external/SDL2/SDL_input.h
deleted file mode 100644
index 38f6f40..0000000
--- a/external/SDL2/SDL_input.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_input.h
- *  
- *  Include file for lowlevel SDL input device handling.
- *
- *  This talks about individual devices, and not the system cursor. If you
- *  just want to know when the user moves the pointer somewhere in your
- *  window, this is NOT the API you want. This one handles things like
- *  multi-touch, drawing tablets, and multiple, separate mice.
- *
- *  The other API is in SDL_mouse.h
- */
-
-#ifndef _SDL_input_h
-#define _SDL_input_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-
-/* Function prototypes */
-
-/* !!! FIXME: real documentation
- * - Redetect devices
- * - This invalidates all existing device information from previous queries!
- * - There is an implicit (re)detect upon SDL_Init().
- */
-extern DECLSPEC int SDLCALL SDL_RedetectInputDevices(void);
-
-/**
- *  \brief Get the number of mouse input devices available.
- */
-extern DECLSPEC int SDLCALL SDL_GetNumInputDevices(void);
-
-/**
- *  \brief Gets the name of a device with the given index.
- *  
- *  \param index is the index of the device, whose name is to be returned.
- *  
- *  \return the name of the device with the specified index
- */
-extern DECLSPEC const char *SDLCALL SDL_GetInputDeviceName(int index);
-
-
-extern DECLSPEC int SDLCALL SDL_IsDeviceDisconnected(int index);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_mouse_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/external/SDL2/merge_sdl2.sh b/external/SDL2/merge_sdl2.sh
deleted file mode 100755
index de45805..0000000
--- a/external/SDL2/merge_sdl2.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-p4 integ -i -d -Dt  //steam/rel/client/src/external/SDL2/... //ValveGames/main/GoldSrc/external/SDL2/...
-p4 integ -i -d -Dt //steam/rel/client/client/osx32/libsdl... //ValveGames/rel/goldsource/hl1/game/libsdl...
-p4 integ -i -d -Dt //steam/rel/client/client/osx32/libsdl... //ValveGames/main/GoldSrc/linux/libsdl...
-p4 integ -i -d -Dt //steam/rel/client/client/ubuntu12_32/libsdl... //ValveGames/rel/goldsource/hl1/game/libsdl...
-p4 integ -i -d -Dt //steam/rel/client/client/ubuntu12_32/libsdl... //ValveGames/main/GoldSrc/linux/libsdl...
-
-p4 integ -i -d -Dt //steam/rel/client/client/sdl... //ValveGames/rel/goldsource/hl1/game/sdl...
-p4 resolve -am //ValveGames/main/GoldSrc/external/SDL2/... 
-p4 resolve -at //ValveGames/rel/goldsource/hl1/game/sdl... //ValveGames/rel/goldsource/hl1/game/libsdl... //ValveGames/main/GoldSrc/linux/libsdl...