diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index abdcf60452f..4f422db5676 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -438,8 +438,6 @@
     layers:
       - state: box
       - state: candle
-  - type: Storage
-    maxTotalWeight: 30
   - type: StorageFill
     contents:
       - id: Candle
@@ -464,8 +462,6 @@
     layers:
       - state: box
       - state: candle
-  - type: Storage
-    maxTotalWeight: 30
   - type: StorageFill
     contents:
       - id: CandleSmall
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml
index b4bfb578c19..13cae992e94 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml
@@ -4,9 +4,6 @@
   id: BoxBeaker
   description: A box full of beakers.
   components:
-  - type: Storage
-    maxTotalWeight: 12
-    maxItemSize: Normal
   - type: StorageFill
     contents:
       - id: Beaker
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
index d5c330f47ed..49a123dec1a 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -38,8 +38,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Storage
-    maxSlots: 10
-    maxItemSize: Small
+    capacity: 50
     whitelist:
       tags:
         - Folder