diff --git a/source/server.h b/source/server.h
index 6b1a053..f0fd928 100644
--- a/source/server.h
+++ b/source/server.h
@@ -124,9 +124,6 @@ typedef struct client_s
 #define	MOVETYPE_BOUNCE			10
 #define MOVETYPE_BOUNCEMISSILE	11		// bounce w/o gravity
 #define MOVETYPE_FOLLOW			12		// track movement of aiment
-#define MOVETYPE_HEAD			13		// track movement of head
-#define MOVETYPE_LARM			14		// track movement of larm
-#define MOVETYPE_RARM			15		// track movement of rarm
 
 
 // edict->solid values
diff --git a/source/sv_phys.c b/source/sv_phys.c
index 2085c6e..3d5902e 100644
--- a/source/sv_phys.c
+++ b/source/sv_phys.c
@@ -68,10 +68,7 @@ void SV_CheckAllEnts (void)
 		if (check->v.movetype == MOVETYPE_PUSH
 		|| check->v.movetype == MOVETYPE_NONE
 		|| check->v.movetype == MOVETYPE_FOLLOW
-		|| check->v.movetype == MOVETYPE_NOCLIP
-		|| check->v.movetype == MOVETYPE_LARM
-		|| check->v.movetype == MOVETYPE_RARM
-		|| check->v.movetype == MOVETYPE_HEAD)
+		|| check->v.movetype == MOVETYPE_NOCLIP)
 			continue;
 
 		if (SV_TestEntityPosition (check))
@@ -639,10 +636,7 @@ edict_t * SV_PushRotate (edict_t *pusher, float movetime)
 		if (check->v.movetype == MOVETYPE_PUSH
 		|| check->v.movetype == MOVETYPE_NONE
 		|| check->v.movetype == MOVETYPE_FOLLOW
-		|| check->v.movetype == MOVETYPE_NOCLIP
-		|| check->v.movetype == MOVETYPE_LARM
-		|| check->v.movetype == MOVETYPE_RARM
-		|| check->v.movetype == MOVETYPE_HEAD)
+		|| check->v.movetype == MOVETYPE_NOCLIP)
 			continue;
 
 		// if the entity is standing on the pusher, it will definately be moved
@@ -1476,22 +1470,6 @@ void SV_Physics_Follow (edict_t *ent)
 	VectorAdd (PROG_TO_EDICT(ent->v.aiment)->v.origin, ent->v.v_angle, ent->v.origin);
 	SV_LinkEdict (ent, true);
 }
-/*
-=============
-SV_Physics_Limbs
-
-Entities that are "stuck" to another entity
-=============
-*/
-void SV_Physics_Limbs (edict_t *ent)
-{
-// regular thinking
-	SV_RunThink (ent);
-	//VectorAdd (PROG_TO_EDICT(ent->v.aiment)->v.origin, ent->v.v_angle, ent->v.origin);
-
-	SV_LinkEdict (ent, true);
-}
-
 
 /*
 =============
@@ -1758,8 +1736,6 @@ void SV_Physics (void)
 			SV_Physics_Follow (ent);
 		else if(ent->v.movetype == MOVETYPE_WALK)
 			SV_Physics_Walk(ent);
-		else if (ent->v.movetype == MOVETYPE_HEAD || ent->v.movetype == MOVETYPE_RARM || ent->v.movetype == MOVETYPE_LARM)
-			SV_Physics_Limbs (ent);
 		else if (ent->v.movetype == MOVETYPE_NOCLIP)
 			SV_Physics_Noclip (ent);
 		else if (ent->v.movetype == MOVETYPE_STEP)