diff --git a/maps/mp/zm_buried.d3dbsp b/maps/mp/zm_buried.d3dbsp
index b4b99d8a..4928ed78 100644
--- a/maps/mp/zm_buried.d3dbsp
+++ b/maps/mp/zm_buried.d3dbsp
@@ -24609,7 +24609,7 @@
 "guid" "D1EECB49"
 }
 {
-"script_noteworthy" "zclassic_processing"
+"script_noteworthy" "zclassic_processing, zstandard_street, zgrief_street"
 "script_location" "street"
 "origin" "-765.434 -925.25 67.0034"
 "angles" "360 270 2.00007"
@@ -24621,7 +24621,7 @@
 }
 {
 "script_location" "street"
-"script_noteworthy" "zclassic_processing"
+"script_noteworthy" "zclassic_processing, zstandard_street, zgrief_street"
 "angles" "0 90 0"
 "origin" "823 -508 61"
 "classname" "script_struct"
@@ -24652,7 +24652,7 @@
 "guid" "45A420E3"
 }
 {
-"script_noteworthy" "zclassic_processing"
+"script_noteworthy" "zclassic_processing, zstandard_street, zgrief_street"
 "script_location" "street"
 "origin" "675.25 -1119.5 117"
 "angles" "0 1.00179e-005 0"
@@ -24663,7 +24663,7 @@
 "guid" "FF59A3C9"
 }
 {
-"script_noteworthy" "zclassic_processing"
+"script_noteworthy" "zclassic_processing, zstandard_street, zgrief_street"
 "script_location" "street"
 "script_int" "-45"
 "origin" "1102.36 -1836.06 181"
diff --git a/maps/mp/zm_transit.d3dbsp b/maps/mp/zm_transit.d3dbsp
index 7d68ea48..49ad5b1d 100644
--- a/maps/mp/zm_transit.d3dbsp
+++ b/maps/mp/zm_transit.d3dbsp
@@ -53240,16 +53240,25 @@
 }
 {
 "script_noteworthy" "zstandard_farm, zgrief_farm"
+"angles" "0 90.2 0"
+"origin" "8035.38 -5316.37 110"
+"classname" "script_struct"
+"zombie_weapon_upgrade" "870mcs_zm"
+"targetname" "weapon_upgrade"
+"target" "pf1918_auto37"
+"guid" "F0390DB3"
+}
+{
+"script_noteworthy" "zstandard_farm, zgrief_farm"
 "targetname" "pf1918_auto37"
 "classname" "script_struct"
-"model" "t6_wpn_sniper_ballista_world"
+"model" "t6_wpn_shotty_870mcs_world"
 "angles" "0 90.2 0"
-"origin" "8035.38 -5317.37 109"
+"origin" "8035.38 -5316.37 110"
 "guid" "6D2A1B25"
 }
 {
 "script_int" "0"
-"script_noteworthy" "zclassic_transit"
 "angles" "0 90 0"
 "origin" "8827 -5838 103"
 "classname" "script_struct"
@@ -53260,7 +53269,6 @@
 }
 {
 "script_int" "0"
-"script_noteworthy" "zclassic_transit"
 "targetname" "pf1919_auto37"
 "classname" "script_struct"
 "model" "t6_wpn_claymore_world"
@@ -53269,15 +53277,6 @@
 "guid" "EE921301"
 }
 {
-"script_noteworthy" "zstandard_farm"
-"targetname" "pf1920_auto37"
-"classname" "script_struct"
-"model" "t6_wpn_taser_knuckles_view"
-"angles" "0 90 0"
-"origin" "8827 -5839 110"
-"guid" "D1EECB49"
-}
-{
 "script_noteworthy" "zclassic_transit"
 "origin" "5002.97 7019 36.5"
 "angles" "0 271.4 0"
diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index 31068754..b0702fbc 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -157,8 +157,6 @@ init()
 
 	weapon_changes();
 
-	wallbuy_location_changes();
-
 	level thread on_player_connect();
 
 	level thread post_all_players_spawned();
@@ -1769,84 +1767,6 @@ player_give_willy_pete()
 	self giveweapon("willy_pete_zm");
 }
 
-wallbuy_location_changes()
-{
-	if (!is_classic())
-	{
-		if (level.scr_zm_map_start_location == "farm")
-		{
-			if (level.scr_zm_ui_gametype == "zstandard")
-			{
-				level thread remove_wallbuy("tazer_knuckles_zm");
-			}
-
-			level thread remove_wallbuy("rottweil72_zm");
-
-			add_wallbuy("870mcs_zm", "zclassic");
-			add_wallbuy("claymore_zm");
-		}
-
-		if (level.scr_zm_map_start_location == "street")
-		{
-			if (level.scr_zm_ui_gametype == "zgrief")
-			{
-				add_wallbuy("beretta93r_zm");
-				add_wallbuy("sig556_zm");
-				add_wallbuy("claymore_zm");
-				add_wallbuy("bowie_knife_zm");
-			}
-		}
-	}
-}
-
-remove_wallbuy(name)
-{
-	flag_wait("start_zombie_round_logic");
-
-	wait 0.05;
-
-	for (i = 0; i < level._unitriggers.trigger_stubs.size; i++)
-	{
-		if (IsDefined(level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade) && level._unitriggers.trigger_stubs[i].zombie_weapon_upgrade == name)
-		{
-			maps\mp\zombies\_zm_unitrigger::unregister_unitrigger(level._unitriggers.trigger_stubs[i]);
-		}
-	}
-}
-
-add_wallbuy(name, script_noteworthy)
-{
-	struct = undefined;
-	spawnable_weapon_spawns = getstructarray("weapon_upgrade", "targetname");
-	spawnable_weapon_spawns = arraycombine(spawnable_weapon_spawns, getstructarray("bowie_upgrade", "targetname"), 1, 0);
-	spawnable_weapon_spawns = arraycombine(spawnable_weapon_spawns, getstructarray("sickle_upgrade", "targetname"), 1, 0);
-	spawnable_weapon_spawns = arraycombine(spawnable_weapon_spawns, getstructarray("tazer_upgrade", "targetname"), 1, 0);
-	spawnable_weapon_spawns = arraycombine(spawnable_weapon_spawns, getstructarray("buildable_wallbuy", "targetname"), 1, 0);
-	spawnable_weapon_spawns = arraycombine(spawnable_weapon_spawns, getstructarray("claymore_purchase", "targetname"), 1, 0);
-
-	for (i = 0; i < spawnable_weapon_spawns.size; i++)
-	{
-		if (IsDefined(spawnable_weapon_spawns[i].zombie_weapon_upgrade) && spawnable_weapon_spawns[i].zombie_weapon_upgrade == name)
-		{
-			if (isDefined(script_noteworthy) && isDefined(spawnable_weapon_spawns[i].script_noteworthy) && !isSubStr(spawnable_weapon_spawns[i].script_noteworthy, script_noteworthy))
-			{
-				continue;
-			}
-
-			struct = spawnable_weapon_spawns[i];
-
-			break;
-		}
-	}
-
-	if (!IsDefined(struct))
-	{
-		return;
-	}
-
-	scripts\zm\replaced\utility::wallbuy(name, struct.target, struct.targetname, struct.origin, struct.angles);
-}
-
 wallbuy_cost_changes()
 {
 	flag_wait("initial_blackscreen_passed");