diff --git a/quakec/fallout2/inventory.qc b/quakec/fallout2/inventory.qc
index 1e13f357f..0fb15c0b5 100644
--- a/quakec/fallout2/inventory.qc
+++ b/quakec/fallout2/inventory.qc
@@ -571,7 +571,7 @@ string(float iid) GetItemWModel =
 float(float iid) WeaponAmmoType =
 {
 	if (iid == IID_WP_USP)
-		return IID_AM_45ACP;
+		return IID_AM_10MM;
 	if (iid == IID_WP_DEAGLE)
 		return IID_AM_44MAGNUM;
 	if (iid == IID_WP_NEEDLER)
diff --git a/quakec/fallout2/weapons.qc b/quakec/fallout2/weapons.qc
index 95e5ef939..445a120a9 100644
--- a/quakec/fallout2/weapons.qc
+++ b/quakec/fallout2/weapons.qc
@@ -2011,24 +2011,6 @@ void (float dam, float rec, string snd, float rng, float rate) FirePistol =
 	if (self.recoil >= 15)
 		self.recoil = 15;
 
-	if (self.attack >= 1)
-	{
-		if (self.position == 0)
-			player_single1 ();
-		if (self.position == 1)
-			player_single1_s ();
-		if (self.position == 2)
-			player_single1 ();
-	}
-	if (self.attack >= 1)
-	{
-		if (self.position == 0)
-			autofire ();
-		if (self.position == 1)
-			autofire_s ();
-		if (self.position == 2)
-			player_single1 ();
-	}
 
 	tmp = 50;
 
@@ -2106,9 +2088,9 @@ void (float dam, float rec, string snd, float rng, float rate) FireSMG =
 	self.attack_finished = (time + rate);
 
 
-	if (self.attack == 0 && self.position == POS_STAND)
+	if (self.position == POS_STAND)
 		autofire ();
-	if (self.attack == 0 && self.position >= POS_DUCK)
+	if (self.position >= POS_DUCK)
 		autofire_s ();
 
 	if (self.position == 0)
@@ -2124,25 +2106,6 @@ void (float dam, float rec, string snd, float rng, float rate) FireSMG =
 	if (self.recoil >= 15)
 		self.recoil = 15;
 
-	if (self.attack >= 1)
-	{
-		if (self.position == 0)
-			player_single1 ();
-		if (self.position == 1)
-			player_single1_s ();
-		if (self.position == 2)
-			player_single1 ();
-	}
-	if (self.attack >= 1)
-	{
-		if (self.position == 0)
-			autofire ();
-		if (self.position == 1)
-			autofire_s ();
-		if (self.position == 2)
-			player_single1 ();
-	}
-
 	tmp = 200;
 
 	if (self.velocity != '0 0 0')
diff --git a/quakec/fallout2/world.qc b/quakec/fallout2/world.qc
index 2d07578a9..28d5e2deb 100644
--- a/quakec/fallout2/world.qc
+++ b/quakec/fallout2/world.qc
@@ -479,7 +479,6 @@ void() worldspawn =
 	precache_model ("progs/v_alien.mdl");
 	precache_model ("progs/v_srifle.mdl");
 	precache_model ("progs/v_night.mdl");
-	precache_model ("progs/v_nailer.mdl");
 	precache_model ("progs/v_piperifle.mdl");
 	precache_model ("progs/v_handgren.mdl");
 	precache_model ("progs/v_jackhammer.mdl");