diff --git a/src/js/game/hud/parts/mass_selector.js b/src/js/game/hud/parts/mass_selector.js
index 3a04ccb6..aaf762bb 100644
--- a/src/js/game/hud/parts/mass_selector.js
+++ b/src/js/game/hud/parts/mass_selector.js
@@ -12,6 +12,7 @@ import { KEYMAPPINGS } from "../../key_action_mapper";
 import { THEME } from "../../theme";
 import { enumHubGoalRewards } from "../../tutorial_goals";
 import { BaseHUDPart } from "../base_hud_part";
+import { enumMouseButton } from "../../camera";
 
 const logger = createLogger("hud/mass_selector");
 
@@ -139,13 +140,12 @@ export class HUDMassSelector extends BaseHUDPart {
     }
 
     clearBelts() {
-        for (const uid of this.selectedUids) {
-            const entity = this.root.entityMgr.findByUid(uid);
+        for (const entity of this.selectedEntities) {
             for (const component of Object.values(entity.components)) {
                 /** @type {Component} */ (component).clear();
             }
         }
-        this.selectedUids = new Set();
+        this.selectedEntities = new Set();
     }
 
     confirmCut() {
diff --git a/src/js/game/systems/belt_reader.js b/src/js/game/systems/belt_reader.js
index 5c18443d..b4b3bb81 100644
--- a/src/js/game/systems/belt_reader.js
+++ b/src/js/game/systems/belt_reader.js
@@ -12,14 +12,9 @@ export class BeltReaderSystem extends GameSystemWithFilter {
         const now = this.root.time.now();
         const minimumTime = now - globalConfig.readerAnalyzeIntervalSeconds;
         const minimumTimeForThroughput = now - 1;
-<<<<<<< HEAD
 
         for (let i = this.allEntitiesArray.length - 1; i >= 0; --i) {
             const entity = this.allEntitiesArray[i];
-=======
-        for (let i = 0; i < this.allEntities.length; ++i) {
-            const entity = this.allEntities[i];
->>>>>>> 5074727efa4910acdb298bbed28c9e7bd1d7849d
             const readerComp = entity.components.BeltReader;
             const pinsComp = entity.components.WiredPins;
 
diff --git a/src/js/game/systems/constant_producer.js b/src/js/game/systems/constant_producer.js
index 5c10b409..3060bf3d 100644
--- a/src/js/game/systems/constant_producer.js
+++ b/src/js/game/systems/constant_producer.js
@@ -14,8 +14,8 @@ export class ConstantProducerSystem extends GameSystemWithFilter {
     }
 
     update() {
-        for (let i = 0; i < this.allEntities.length; ++i) {
-            const entity = this.allEntities[i];
+        for (let i = this.allEntitiesArray.length - 1; i >= 0; --i) {
+            const entity = this.allEntitiesArray[i];
             const signalComp = entity.components.ConstantSignal;
             const ejectorComp = entity.components.ItemEjector;
             if (!ejectorComp) {
diff --git a/src/js/game/systems/goal_acceptor.js b/src/js/game/systems/goal_acceptor.js
index 40100324..28965961 100644
--- a/src/js/game/systems/goal_acceptor.js
+++ b/src/js/game/systems/goal_acceptor.js
@@ -20,8 +20,8 @@ export class GoalAcceptorSystem extends GameSystemWithFilter {
 
         let allAccepted = true;
 
-        for (let i = 0; i < this.allEntities.length; ++i) {
-            const entity = this.allEntities[i];
+        for (let i = this.allEntitiesArray.length - 1; i >= 0; --i) {
+            const entity = this.allEntitiesArray[i];
             const goalComp = entity.components.GoalAcceptor;
 
             if (!goalComp.lastDelivery) {