diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp
index 2c01fa4a63..2b23849397 100644
--- a/src/openrct2/entity/Guest.cpp
+++ b/src/openrct2/entity/Guest.cpp
@@ -5324,57 +5324,47 @@ void Guest::Update()
             case PeepState::Picked:
                 UpdatePicked();
                 break;
+            case PeepState::QueuingFront:
+                UpdateRide();
+                break;
+            case PeepState::LeavingRide:
+                UpdateRide();
+                break;
+            case PeepState::Walking:
+                UpdateWalking();
+                break;
+            case PeepState::Queuing:
+                UpdateQueuing();
+                break;
+            case PeepState::EnteringRide:
+                UpdateRide();
+                break;
+            case PeepState::Sitting:
+                UpdateSitting();
+                break;
+            case PeepState::EnteringPark:
+                UpdateEnteringPark();
+                break;
+            case PeepState::LeavingPark:
+                UpdateLeavingPark();
+                break;
+            case PeepState::Buying:
+                UpdateBuying();
+                break;
+            case PeepState::Watching:
+                UpdateWatching();
+                break;
+            case PeepState::UsingBin:
+                UpdateUsingBin();
+                break;
             default:
-                UpdateGuest();
+                // TODO reset to default state
+                assert(false);
                 break;
         }
     }
 }
 
-void Guest::UpdateGuest()
-{
-    switch (State)
-    {
-        case PeepState::QueuingFront:
-            UpdateRide();
-            break;
-        case PeepState::LeavingRide:
-            UpdateRide();
-            break;
-        case PeepState::Walking:
-            UpdateWalking();
-            break;
-        case PeepState::Queuing:
-            UpdateQueuing();
-            break;
-        case PeepState::EnteringRide:
-            UpdateRide();
-            break;
-        case PeepState::Sitting:
-            UpdateSitting();
-            break;
-        case PeepState::EnteringPark:
-            UpdateEnteringPark();
-            break;
-        case PeepState::LeavingPark:
-            UpdateLeavingPark();
-            break;
-        case PeepState::Buying:
-            UpdateBuying();
-            break;
-        case PeepState::Watching:
-            UpdateWatching();
-            break;
-        case PeepState::UsingBin:
-            UpdateUsingBin();
-            break;
-        default:
-            // TODO reset to default state
-            assert(false);
-            break;
-    }
-}
-
 /**
  *
  *  rct2: 0x691A30
diff --git a/src/openrct2/entity/Guest.h b/src/openrct2/entity/Guest.h
index 69faf913ef..5fc5e2e1c0 100644
--- a/src/openrct2/entity/Guest.h
+++ b/src/openrct2/entity/Guest.h
@@ -321,7 +321,6 @@ public:
     uint64_t ItemFlags;
 
     void Update();
-    void UpdateGuest();
     void Tick128UpdateGuest(uint32_t index);
     uint64_t GetFoodOrDrinkFlags() const;
     uint64_t GetEmptyContainerFlags() const;
diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp
index 9a4579025c..2e81d1353e 100644
--- a/src/openrct2/entity/Staff.cpp
+++ b/src/openrct2/entity/Staff.cpp
@@ -1732,51 +1732,41 @@ void Staff::Update()
             case PeepState::Picked:
                 UpdatePicked();
                 break;
+            case PeepState::Patrolling:
+                UpdatePatrolling();
+                break;
+            case PeepState::Mowing:
+                UpdateMowing();
+                break;
+            case PeepState::Sweeping:
+                UpdateSweeping();
+                break;
+            case PeepState::Answering:
+                UpdateAnswering();
+                break;
+            case PeepState::Fixing:
+                UpdateFixing(stepsToTake);
+                break;
+            case PeepState::Inspecting:
+                UpdateFixing(stepsToTake);
+                break;
+            case PeepState::EmptyingBin:
+                UpdateEmptyingBin();
+                break;
+            case PeepState::Watering:
+                UpdateWatering();
+                break;
+            case PeepState::HeadingToInspection:
+                UpdateHeadingToInspect();
+                break;
             default:
-                UpdateStaff(stepsToTake);
+                // TODO reset to default state
+                assert(false);
                 break;
         }
     }
 }
 
-void Staff::UpdateStaff(uint32_t stepsToTake)
-{
-    switch (State)
-    {
-        case PeepState::Patrolling:
-            UpdatePatrolling();
-            break;
-        case PeepState::Mowing:
-            UpdateMowing();
-            break;
-        case PeepState::Sweeping:
-            UpdateSweeping();
-            break;
-        case PeepState::Answering:
-            UpdateAnswering();
-            break;
-        case PeepState::Fixing:
-            UpdateFixing(stepsToTake);
-            break;
-        case PeepState::Inspecting:
-            UpdateFixing(stepsToTake);
-            break;
-        case PeepState::EmptyingBin:
-            UpdateEmptyingBin();
-            break;
-        case PeepState::Watering:
-            UpdateWatering();
-            break;
-        case PeepState::HeadingToInspection:
-            UpdateHeadingToInspect();
-            break;
-        default:
-            // TODO reset to default state
-            assert(false);
-            break;
-    }
-}
-
 /**
  *
  *  rct2: 0x006BF1FD
diff --git a/src/openrct2/entity/Staff.h b/src/openrct2/entity/Staff.h
index 8e060c551d..301b9c51db 100644
--- a/src/openrct2/entity/Staff.h
+++ b/src/openrct2/entity/Staff.h
@@ -60,7 +60,6 @@ public:
     uint32_t StaffBinsEmptied;
 
     void Update();
-    void UpdateStaff(uint32_t stepsToTake);
     void Tick128UpdateStaff();
     bool IsMechanic() const;
     bool IsPatrolAreaSet(const CoordsXY& coords) const;