diff --git a/src/client/entry.c b/src/client/entry.c
index 5ac89cee..911febda 100644
--- a/src/client/entry.c
+++ b/src/client/entry.c
@@ -605,17 +605,16 @@ CSQC_ConsoleCommand(string sCMD)
 	tokenize(sCMD);
 	
 	switch (argv(0)) {
-		case "dev_sentence":
-			static CBaseEntity foo;
-			if (!foo) {
-				foo = spawn(CBaseEntity);
-				foo.drawmask = MASK_ENGINE;
-				setmodel(foo, "models/headcrab.mdl");
-			}
-			setorigin(foo, getproperty(VF_ORIGIN));
-			foo.Sentence(argv(1));
-			break;
-			
+	case "dev_sentence":
+		static CBaseEntity foo;
+		if (!foo) {
+			foo = spawn(CBaseEntity);
+			foo.drawmask = MASK_ENGINE;
+			setmodel(foo, "sprites/muzzleflash1.spr");
+		}
+		setorigin(foo, getproperty(VF_ORIGIN));
+		foo.Sentence(argv(1));
+		break;
 	case "vote":
 		if (argv(1) == "yes") {
 			sendevent("VoteY", "");
diff --git a/src/client/fx_lensflare.c b/src/client/fx_lensflare.c
index f8b7b05f..767f5018 100644
--- a/src/client/fx_lensflare.c
+++ b/src/client/fx_lensflare.c
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-int trace_surfaceflagsi;
+noref int trace_surfaceflagsi;
 var vector g_vecLensPos;
 var float g_flLensAlpha;
 
diff --git a/src/shared/cstrike/w_ak47.c b/src/shared/cstrike/w_ak47.c
index 335eea43..9202960d 100644
--- a/src/shared/cstrike/w_ak47.c
+++ b/src/shared/cstrike/w_ak47.c
@@ -142,8 +142,6 @@ w_ak47_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_ak47.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_aug.c b/src/shared/cstrike/w_aug.c
index 3da80b10..3e2cb402 100644
--- a/src/shared/cstrike/w_aug.c
+++ b/src/shared/cstrike/w_aug.c
@@ -142,8 +142,6 @@ w_aug_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_aug.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_awp.c b/src/shared/cstrike/w_awp.c
index 09bea7b5..6fb6483b 100644
--- a/src/shared/cstrike/w_awp.c
+++ b/src/shared/cstrike/w_awp.c
@@ -141,8 +141,6 @@ w_awp_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_awp.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_deagle.c b/src/shared/cstrike/w_deagle.c
index f48eceab..d85f6a1b 100644
--- a/src/shared/cstrike/w_deagle.c
+++ b/src/shared/cstrike/w_deagle.c
@@ -137,7 +137,6 @@ w_deagle_primary(void)
 	pl.deagle_mag--;
 	TraceAttack_FireBullets(1, pl.origin + pl.view_ofs, 54, [accuracy,accuracy], WEAPON_DEAGLE);
 
-
 	if (self.flags & FL_CROUCHING)
 		Animation_PlayerTopTemp(ANIM_SHOOT1HAND, 0.45f);
 	else
@@ -146,7 +145,6 @@ w_deagle_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_deagle.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	if (pl.a_ammo1 <= 0) {
 		Weapons_ViewAnimation(DEAGLE_SHOOT_EMPTY);
diff --git a/src/shared/cstrike/w_elites.c b/src/shared/cstrike/w_elites.c
index 0df2d78d..179993ae 100644
--- a/src/shared/cstrike/w_elites.c
+++ b/src/shared/cstrike/w_elites.c
@@ -156,8 +156,6 @@ w_elites_primary(void)
 
 	pl.a_ammo3 = 1 - pl.a_ammo3;
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 5;
 	if (pl.a_ammo3) {
 		if (pl.a_ammo1 <= 0) {
diff --git a/src/shared/cstrike/w_fiveseven.c b/src/shared/cstrike/w_fiveseven.c
index 6a352607..026917bf 100644
--- a/src/shared/cstrike/w_fiveseven.c
+++ b/src/shared/cstrike/w_fiveseven.c
@@ -145,8 +145,6 @@ w_fiveseven_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_fiveseven.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	if (pl.a_ammo1 <= 0) {
 		Weapons_ViewAnimation(FIVESEVEN_SHOOT_EMPTY);
 	} else {
diff --git a/src/shared/cstrike/w_flashbang.c b/src/shared/cstrike/w_flashbang.c
index 33b4b057..1dc7241f 100644
--- a/src/shared/cstrike/w_flashbang.c
+++ b/src/shared/cstrike/w_flashbang.c
@@ -94,7 +94,6 @@ w_flashbang_primary(void)
 
 #ifdef CSQC
 	View_SetMuzzleflash(MUZZLE_RIFLE);
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_g3sg1.c b/src/shared/cstrike/w_g3sg1.c
index fefbebf0..85f0199f 100644
--- a/src/shared/cstrike/w_g3sg1.c
+++ b/src/shared/cstrike/w_g3sg1.c
@@ -140,8 +140,6 @@ w_g3sg1_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_g3sg1.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 2;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_glock18.c b/src/shared/cstrike/w_glock18.c
index 9e0db717..d4289cf7 100644
--- a/src/shared/cstrike/w_glock18.c
+++ b/src/shared/cstrike/w_glock18.c
@@ -166,7 +166,6 @@ w_glock18_primary(void)
 		Sound_Play(pl, CHAN_WEAPON, "weapon_glock18.fire");
 	}
 #endif
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	if (pl.a_ammo3) {
 		int r = (float)input_sequence % 2;
diff --git a/src/shared/cstrike/w_hegrenade.c b/src/shared/cstrike/w_hegrenade.c
index d41d17dd..34398fa8 100644
--- a/src/shared/cstrike/w_hegrenade.c
+++ b/src/shared/cstrike/w_hegrenade.c
@@ -91,7 +91,6 @@ w_hegrenade_primary(void)
 
 #ifdef CSQC
 	View_SetMuzzleflash(MUZZLE_RIFLE);
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_knife.c b/src/shared/cstrike/w_knife.c
index 49ea01f4..68af8c70 100644
--- a/src/shared/cstrike/w_knife.c
+++ b/src/shared/cstrike/w_knife.c
@@ -94,7 +94,6 @@ w_knife_primary(void)
 
 #ifdef CSQC
 	View_SetMuzzleflash(MUZZLE_RIFLE);
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_m3.c b/src/shared/cstrike/w_m3.c
index 776d2430..ca8c216e 100644
--- a/src/shared/cstrike/w_m3.c
+++ b/src/shared/cstrike/w_m3.c
@@ -150,8 +150,6 @@ w_m3_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_m3.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 2;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_m4a1.c b/src/shared/cstrike/w_m4a1.c
index 0464053d..29039de5 100644
--- a/src/shared/cstrike/w_m4a1.c
+++ b/src/shared/cstrike/w_m4a1.c
@@ -170,7 +170,6 @@ w_m4a1_primary(void)
 	else
 		Animation_PlayerTopTemp(ANIM_CR_SHOOT1HAND, 0.45f);
 #endif
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	/* this stuff is predicted */
 	int r = (float)input_sequence % 3;
@@ -199,7 +198,6 @@ w_m4a1_primary(void)
 			break;
 		}
 	}
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	pl.w_attack_next = 0.0875f;
 	pl.w_idle_next = pl.w_attack_next;
diff --git a/src/shared/cstrike/w_mac10.c b/src/shared/cstrike/w_mac10.c
index 4c20bdd7..cab4ab05 100644
--- a/src/shared/cstrike/w_mac10.c
+++ b/src/shared/cstrike/w_mac10.c
@@ -141,8 +141,6 @@ w_mac10_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_mac10.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_mp5.c b/src/shared/cstrike/w_mp5.c
index ba6a61bb..990530f7 100644
--- a/src/shared/cstrike/w_mp5.c
+++ b/src/shared/cstrike/w_mp5.c
@@ -145,7 +145,6 @@ w_mp5_primary(void)
 
 	Sound_Play(pl, CHAN_WEAPON, "weapon_mp5.fire");
 #endif
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_p228.c b/src/shared/cstrike/w_p228.c
index e4a6def3..26e2935a 100644
--- a/src/shared/cstrike/w_p228.c
+++ b/src/shared/cstrike/w_p228.c
@@ -149,8 +149,6 @@ w_p228_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_p228.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	if (pl.a_ammo1 <= 0) {
 		Weapons_ViewAnimation(P228_SHOOT_EMPTY);
 	} else {
diff --git a/src/shared/cstrike/w_p90.c b/src/shared/cstrike/w_p90.c
index 83f0a080..173a80af 100644
--- a/src/shared/cstrike/w_p90.c
+++ b/src/shared/cstrike/w_p90.c
@@ -141,7 +141,6 @@ w_p90_primary(void)
 
 	Sound_Play(pl, CHAN_WEAPON, "weapon_p90.fire");
 #endif
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_para.c b/src/shared/cstrike/w_para.c
index 3dbd9ee5..b28f0fdf 100644
--- a/src/shared/cstrike/w_para.c
+++ b/src/shared/cstrike/w_para.c
@@ -141,8 +141,6 @@ w_para_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_para.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 2;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_scout.c b/src/shared/cstrike/w_scout.c
index b266a5c8..d1302ef7 100644
--- a/src/shared/cstrike/w_scout.c
+++ b/src/shared/cstrike/w_scout.c
@@ -141,8 +141,6 @@ w_scout_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_scout.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 2;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_sg550.c b/src/shared/cstrike/w_sg550.c
index d56342e5..376b24d1 100644
--- a/src/shared/cstrike/w_sg550.c
+++ b/src/shared/cstrike/w_sg550.c
@@ -141,8 +141,6 @@ w_sg550_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_sg550.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 2;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_sg552.c b/src/shared/cstrike/w_sg552.c
index 95045cdb..d0d519e4 100644
--- a/src/shared/cstrike/w_sg552.c
+++ b/src/shared/cstrike/w_sg552.c
@@ -142,8 +142,6 @@ w_sg552_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_sg552.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_smokegrenade.c b/src/shared/cstrike/w_smokegrenade.c
index 3cc61978..07a16347 100644
--- a/src/shared/cstrike/w_smokegrenade.c
+++ b/src/shared/cstrike/w_smokegrenade.c
@@ -94,7 +94,6 @@ w_smokegrenade_primary(void)
 
 #ifdef CSQC
 	View_SetMuzzleflash(MUZZLE_RIFLE);
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_tmp.c b/src/shared/cstrike/w_tmp.c
index ec92222a..b178a506 100644
--- a/src/shared/cstrike/w_tmp.c
+++ b/src/shared/cstrike/w_tmp.c
@@ -141,7 +141,6 @@ w_tmp_primary(void)
 
 	Sound_Play(pl, CHAN_WEAPON, "weapon_tmp.fire");
 #endif
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	int r = (float)input_sequence % 3;
 	switch (r) {
diff --git a/src/shared/cstrike/w_ump45.c b/src/shared/cstrike/w_ump45.c
index 8f05609d..1ca80dea 100644
--- a/src/shared/cstrike/w_ump45.c
+++ b/src/shared/cstrike/w_ump45.c
@@ -142,8 +142,6 @@ w_ump45_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_ump45.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0:
diff --git a/src/shared/cstrike/w_usp45.c b/src/shared/cstrike/w_usp45.c
index b29f9b30..a4345dff 100644
--- a/src/shared/cstrike/w_usp45.c
+++ b/src/shared/cstrike/w_usp45.c
@@ -175,7 +175,6 @@ w_usp45_primary(void)
 	else
 		Animation_PlayerTopTemp(ANIM_CR_SHOOT1HAND, 0.45f);
 #endif
-	Weapons_ViewPunchAngle([-2,0,0]);
 
 	/* this stuff is predicted */
 	int r = (float)input_sequence % 3;
diff --git a/src/shared/cstrike/w_xm1014.c b/src/shared/cstrike/w_xm1014.c
index 453a7d78..4b235217 100644
--- a/src/shared/cstrike/w_xm1014.c
+++ b/src/shared/cstrike/w_xm1014.c
@@ -152,8 +152,6 @@ w_xm1014_primary(void)
 	Sound_Play(pl, CHAN_WEAPON, "weapon_xm1014.fire");
 #endif
 
-	Weapons_ViewPunchAngle([-2,0,0]);
-
 	int r = (float)input_sequence % 3;
 	switch (r) {
 	case 0: