diff --git a/source/server/entities/powerups.qc b/source/server/entities/powerups.qc
index 69d661b..fa03138 100644
--- a/source/server/entities/powerups.qc
+++ b/source/server/entities/powerups.qc
@@ -417,11 +417,7 @@ void() PU_MaxAmmo =
 		// MAX AMMO! text
 		#ifdef PC
 		ScrollText("MAX AMMO!", tempe);
-		#endif
-		#ifdef HANDHELD
-		nzp_maxammo();
-		#endif
-		#ifdef QUAKESPASM
+		#else
 		nzp_maxammo();
 		#endif
 		tempe = find(tempe, classname, "player");
diff --git a/source/server/weapons/ray_gun.qc b/source/server/weapons/ray_gun.qc
index 4571f27..4ab4dda 100644
--- a/source/server/weapons/ray_gun.qc
+++ b/source/server/weapons/ray_gun.qc
@@ -158,43 +158,28 @@ void() W_FireRay =
 
     // Prepare trail effects.
 	if (IsPapWeapon(porter.weapon)) {
-#ifdef HANDHELD
-
-		porter.effects = EF_RAYRED;
-
-#endif // HANDHELD
-
-#ifdef QUAKESPASM
-
-		porter.effects = EF_RED;
-
-#endif // QUAKESPASM
 
 #ifdef PC
 
 		Light_Custom(porter, false, 75, 2, 0.25, 0.25);
 
+#else
+	
+		porter.effects = EF_RAYRED;
+
 #endif // PC
 
 	} else {
 
-#ifdef HANDHELD
-
-		porter.effects = EF_RAYGREEN;
-
-#endif // HANDHELD
-
-#ifdef QUAKESPASM
-
-		porter.effects = EF_GREEN;
-
-#endif // QUAKESPASM
-
 #ifdef PC
 
 		Light_Custom(porter, false, 75, 0.25, 2, 0.25);
 
-#endif // PC
+#else
+
+		porter.effects = EF_RAYGREEN;
+		
+#endif	// PC
 	}
 
     // final setup!
diff --git a/source/server/weapons/weapon_core.qc b/source/server/weapons/weapon_core.qc
index 4124e51..98b59bf 100644
--- a/source/server/weapons/weapon_core.qc
+++ b/source/server/weapons/weapon_core.qc
@@ -68,15 +68,15 @@ void() W_AimIn =
 	    self.weapon == W_HEADCRACKER || self.weapon == W_PENETRATOR) {
 		SetUpdate(self, UT_ZOOM2, 0, 0, 0);
 
-#ifdef QUAKESPASM
+//#ifdef QUAKESPASM
 
-		self.zoom = 1;
+		//self.zoom = 1;
 
-#else
+//#else
 
 		self.zoom = 2;
 
-#endif // QUAKESPASM
+//#endif // QUAKESPASM
 
 		self.scopetime = time + 0.3;
 	} else {