diff --git a/src/server/ammo_p646.qc b/src/server/ammo_p646.qc
index 8699fd0..db36ad7 100644
--- a/src/server/ammo_p646.qc
+++ b/src/server/ammo_p646.qc
@@ -14,7 +14,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-class item_ammo:CBaseEntity
+class item_ammo:NSRenderableEntity
 {
 	void(void) item_ammo;
 	virtual void(void) Respawn;
@@ -66,7 +66,7 @@ item_ammo::item_ammo(void)
 {
 	GetSpawnModel() = model;
 	SetModel(GetSpawnModel());
-	CBaseEntity::CBaseEntity();
+	NSRenderableEntity::NSRenderableEntity();
 }
 
 /*
diff --git a/src/shared/input.qc b/src/shared/input.qc
index 95b1b52..7423a1f 100644
--- a/src/shared/input.qc
+++ b/src/shared/input.qc
@@ -45,15 +45,6 @@ Game_Input(player pl)
 			Weapons_AddItem(pl, WEAPON_XS, -1);
 			Weapons_AddItem(pl, WEAPON_SATCHEL, -1);
 		}
-
-		if (pl.impulse == 102) {
-			// Respawn all the entities
-			for (entity a = world; (a = findfloat(a, ::identity, 1));) {
-				CBaseEntity caw = (CBaseEntity)a;
-				caw.Respawn();
-			}
-			bprint(PRINT_HIGH, "Respawning all map entities...\n");
-		}
 	}
 
 	pl.impulse = 0;