diff --git a/src/components/chat_message/chat_message.style.js b/src/components/chat_message/chat_message.style.js
index 73068a7a5..76b565823 100644
--- a/src/components/chat_message/chat_message.style.js
+++ b/src/components/chat_message/chat_message.style.js
@@ -8,8 +8,6 @@ export default {
     'Text',
     'Icon',
     'Border',
-    // Optimization: don't put heavy components unless needed
-    // 'Button',
     'PollGraph'
   ],
   defaultRules: [
diff --git a/src/components/mobile_drawer.style.js b/src/components/mobile_drawer.style.js
index da3923fc9..0f2cf4e59 100644
--- a/src/components/mobile_drawer.style.js
+++ b/src/components/mobile_drawer.style.js
@@ -2,17 +2,7 @@ export default {
   name: 'MobileDrawer',
   selector: '.mobile-drawer',
   validInnerComponents: [
-    'Text',
-    'Link',
-    'Icon',
-    'Border',
-    // Optimization: don't put heavy components unless needed
-    // 'Button',
-    // 'ButtonUnstyled',
-    // 'Input',
-    'MenuItem',
-    'Notification',
-    'Alert'
+    'MenuItem'
   ],
   defaultRules: [
     {
@@ -20,21 +10,6 @@ export default {
         background: '--bg',
         backgroundNoCssColor: 'yes'
       }
-    },
-    {
-      component: 'PanelHeader',
-      parent: { component: 'MobileDrawer' },
-      directives: {
-        background: '--fg',
-        shadow: [{
-          x: 0,
-          y: 0,
-          blur: 4,
-          spread: 0,
-          color: '#000000',
-          alpha: 0.6
-        }]
-      }
     }
   ]
 }
diff --git a/src/components/panel.style.js b/src/components/panel.style.js
index 88dcf4382..2c8956ae1 100644
--- a/src/components/panel.style.js
+++ b/src/components/panel.style.js
@@ -8,7 +8,8 @@ export default {
     'Border',
     'PanelHeader',
     'Post',
-    'Notification'
+    'Notification',
+    'MenuItem'
   ],
   validInnerComponentsLite: [
     'Text',
diff --git a/src/components/panel_header.style.js b/src/components/panel_header.style.js
index 06a4fa724..4e5f97760 100644
--- a/src/components/panel_header.style.js
+++ b/src/components/panel_header.style.js
@@ -7,7 +7,6 @@ export default {
     'Icon',
     'Button',
     'ButtonUnstyled',
-    'Badge',
     'Alert'
   ],
   defaultRules: [
diff --git a/src/components/popover.style.js b/src/components/popover.style.js
index 9c87a3c95..455b5f5e0 100644
--- a/src/components/popover.style.js
+++ b/src/components/popover.style.js
@@ -6,14 +6,6 @@ export default {
     modal: '.modal'
   },
   validInnerComponents: [
-    'Text',
-    'Link',
-    'Icon',
-    'Border',
-    // Optimization: don't put heavy components unless needed
-    // 'Button',
-    // 'ButtonUnstyled',
-    // 'Input',
     'MenuItem'
   ],
   defaultRules: [
diff --git a/src/components/status/post.style.js b/src/components/status/post.style.js
index a63cbed38..43e21a16e 100644
--- a/src/components/status/post.style.js
+++ b/src/components/status/post.style.js
@@ -9,21 +9,9 @@ export default {
     'Link',
     'Icon',
     'Border',
-    // Optimization: don't put heavy components unless needed
-    // 'Button',
-    // 'ButtonUnstyled',
-    // 'Input',
     'Avatar',
     'PollGraph'
   ],
-  validInnerComponentsLite: [
-    'Text',
-    'Link',
-    'Icon',
-    'Border',
-    'ButtonUnstyled',
-    'Avatar'
-  ],
   defaultRules: [
     {
       directives: {
diff --git a/src/components/top_bar.style.js b/src/components/top_bar.style.js
index 5aaace639..89c5243db 100644
--- a/src/components/top_bar.style.js
+++ b/src/components/top_bar.style.js
@@ -6,8 +6,8 @@ export default {
     'Text',
     'Icon',
     // Optimization: don't put heavy components unless needed
-    // 'Button',
-    // 'ButtonUnstyled',
+    'Button',
+    'ButtonUnstyled',
     'Input',
     'Badge'
   ],
diff --git a/src/components/user_card/user_card.style.js b/src/components/user_card/user_card.style.js
index e77963a02..b6e256392 100644
--- a/src/components/user_card/user_card.style.js
+++ b/src/components/user_card/user_card.style.js
@@ -2,11 +2,6 @@ export default {
   name: 'UserCard',
   selector: '.user-card',
   notEditable: true,
-  validInnerComponents: [
-    'Text',
-    'Link',
-    'Icon',
-  ],
   defaultRules: [
     {
       directives: {