diff --git a/Content.Shared/ADT/Quirks/EntitySystems/SharedQuirksSystem.cs b/Content.Shared/ADT/Quirks/EntitySystems/SharedQuirksSystem.cs
index 199a6593e5..0eb4ffa0e8 100644
--- a/Content.Shared/ADT/Quirks/EntitySystems/SharedQuirksSystem.cs
+++ b/Content.Shared/ADT/Quirks/EntitySystems/SharedQuirksSystem.cs
@@ -5,7 +5,7 @@
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Content.Shared.Tools.Components;
-using Content.Shared.Storage.Components;
+using Content.Shared.StepTrigger.Systems;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Tag;
@@ -25,10 +25,6 @@ public abstract class SharedQuirksSystem : EntitySystem
 
     public override void Initialize()
     {
-        //SubscribeLocalEvent<SharedEntityStorageComponent, GetVerbsEvent<AlternativeVerb>>(OnGetHideVerbs);
-
-        SubscribeLocalEvent<SoftWalkComponent, MapInitEvent>(OnSoftWalkMapInit);
-
         SubscribeLocalEvent<FreerunningComponent, CheckClimbSpeedModifiersEvent>(OnFreerunningClimbTimeModify);
 
         SubscribeLocalEvent<SprinterComponent, MapInitEvent>(OnSprinterMapInit);
@@ -37,27 +33,6 @@ public override void Initialize()
         SubscribeLocalEvent<HardThrowerComponent, CheckThrowRangeModifiersEvent>(OnThrowerRangeModify);
     }
 
-    //private void OnGetHideVerbs(EntityUid uid, SharedEntityStorageComponent comp, GetVerbsEvent<AlternativeVerb> args)
-    //{
-    //    if (!args.CanAccess || !args.CanInteract)
-    //        return;
-
-    //    if (!HasComp<FastLockersComponent>(args.User))
-    //        return;
-    //    if (TryComp<WeldableComponent>(uid, out var weldable) && weldable.IsWelded)
-    //        return;
-    //    if (!comp.ItemCanStoreMobs)
-    //        return;
-
-    //    AlternativeVerb verb = new()
-    //    {
-    //        Act = () => TryHide(args.User, uid),
-    //        Text = Loc.GetString("quirk-fast-locker-hide-verb"),
-    //    };
-    //    args.Verbs.Add(verb);
-
-    //}
-
     public void TryHide(EntityUid uid, EntityUid closet)
     {
         if (_storage.Insert(uid, closet))
@@ -68,11 +43,6 @@ public void TryHide(EntityUid uid, EntityUid closet)
             _popup.PopupCursor(Loc.GetString("quirk-fast-locker-hide-fail"), uid);
     }
 
-    private void OnSoftWalkMapInit(EntityUid uid, SoftWalkComponent comp, MapInitEvent args)
-    {
-        EnsureComp<StepTriggerImmuneComponent>(uid, out _);
-    }
-
     private void OnFreerunningClimbTimeModify(EntityUid uid, FreerunningComponent comp, ref CheckClimbSpeedModifiersEvent args)
     {
         if (args.User == args.Climber)
diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
index ca72a20ae9..077225669f 100644
--- a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
+++ b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Examine;
+using Content.Shared.ADT.Traits;
+using Content.Shared.Examine;
 using Content.Shared.Inventory;
 using Content.Shared.StepTrigger.Components;
 using Content.Shared.Tag;
@@ -24,6 +25,9 @@ private void OnStepTriggerAttempt(Entity<StepTriggerImmuneComponent> ent, ref St
 
     private void OnStepTriggerClothingAttempt(EntityUid uid, ClothingRequiredStepTriggerComponent component, ref StepTriggerAttemptEvent args)
     {
+        if (HasComp<SoftWalkComponent>(args.Tripper))   // ADT Quirks
+            args.Cancelled = true;
+
         if (_inventory.TryGetInventoryEntity<ClothingRequiredStepTriggerImmuneComponent>(args.Tripper, out _))
         {
             args.Cancelled = true;