Revert "Upstream (#148)"

This reverts commit 9f00d4b9aa.

Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs

@@ -119,4 +119,9 @@ public class ActionButtonContainer : GridContainer
                 yield return button;
         }
     }
+
+    ~ActionButtonContainer()
+    {
+        UserInterfaceManager.GetUIController<ActionUIController>().RemoveActionContainer();
+    }
 }

Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotButtonContainer.cs

@@ -22,4 +22,9 @@ public sealed class ItemSlotButtonContainer : ItemSlotUIContainer<SlotControl>
     {
         _inventoryController = UserInterfaceManager.GetUIController<InventoryUIController>();
     }
+
+    ~ItemSlotButtonContainer()
+    {
+        _inventoryController.RemoveSlotGroup(SlotGroup);
+    }
 }

Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs

@@ -9,7 +9,7 @@ using Robust.Client.UserInterface.CustomControls;
 
 namespace Content.Client.UserInterface.Systems.Storage.Controls;
 
-public sealed class ItemGridPiece : Control, IEntityControl
+public sealed class ItemGridPiece : Control
 {
     private readonly IEntityManager _entityManager;
     private readonly StorageUIController _storageController;
@@ -287,8 +287,6 @@ public sealed class ItemGridPiece : Control, IEntityControl
         var actualSize = new Vector2(boxSize.X + 1, boxSize.Y + 1);
         return actualSize * new Vector2i(8, 8);
     }
-
-    public EntityUid? UiEntity => Entity;
 }
 
 public enum ItemGridPieceMarks