diff --git a/src/components/attachment/attachment.style.js b/src/components/attachment/attachment.style.js
deleted file mode 100644
index a9455e367..000000000
--- a/src/components/attachment/attachment.style.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export default {
-  name: 'Attachment',
-  selector: '.Attachment',
-  notEditable: true,
-  validInnerComponents: [
-    'Border',
-    'Button',
-    'Input'
-  ],
-  defaultRules: [
-    {
-      directives: {
-        roundness: 3
-      }
-    },
-    {
-      component: 'Button',
-      parent: {
-        component: 'Attachment'
-      },
-      directives: {
-        background: '#FFFFFF',
-        opacity: 0.5
-      }
-    }
-  ]
-}
diff --git a/src/components/chat_message/chat_message.style.js b/src/components/chat_message/chat_message.style.js
index 9b57ad371..f4fc17409 100644
--- a/src/components/chat_message/chat_message.style.js
+++ b/src/components/chat_message/chat_message.style.js
@@ -8,9 +8,9 @@ export default {
     'Text',
     'Icon',
     'Border',
-    'Button',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
     'RichContent',
-    'Attachment',
     'PollGraph'
   ],
   defaultRules: [
diff --git a/src/components/list/list_item.style.js b/src/components/list/list_item.style.js
index 49b2b035f..0094621c5 100644
--- a/src/components/list/list_item.style.js
+++ b/src/components/list/list_item.style.js
@@ -10,8 +10,9 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'ButtonUnstyled',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
     'RichContent',
     'Input',
     'Avatar'
diff --git a/src/components/mobile_drawer.style.js b/src/components/mobile_drawer.style.js
index 398bc186e..a17befb63 100644
--- a/src/components/mobile_drawer.style.js
+++ b/src/components/mobile_drawer.style.js
@@ -6,9 +6,10 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'ButtonUnstyled',
-    'Input',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
+    // 'Input',
     'PanelHeader',
     'MenuItem',
     'Notification',
diff --git a/src/components/notification/notification.style.js b/src/components/notification/notification.style.js
index c6d317d1c..34048bdff 100644
--- a/src/components/notification/notification.style.js
+++ b/src/components/notification/notification.style.js
@@ -6,12 +6,12 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'ButtonUnstyled',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
     'RichContent',
-    'Input',
+    // 'Input',
     'Avatar',
-    'Attachment',
     'PollGraph'
   ],
   defaultRules: []
diff --git a/src/components/panel.style.js b/src/components/panel.style.js
index a017a52bc..bf28356a0 100644
--- a/src/components/panel.style.js
+++ b/src/components/panel.style.js
@@ -6,9 +6,10 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'ButtonUnstyled',
-    'Input',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
+    // 'Input',
     'PanelHeader',
     'MenuItem',
     'Post',
@@ -16,7 +17,6 @@ export default {
     'Alert',
     'UserCard',
     'Chat',
-    'Attachment',
     'Tab',
     'ListItem'
   ],
@@ -25,8 +25,9 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'Input',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'Input',
     'PanelHeader',
     'Alert'
   ],
diff --git a/src/components/popover.style.js b/src/components/popover.style.js
index 0197271b9..02ab6d0d3 100644
--- a/src/components/popover.style.js
+++ b/src/components/popover.style.js
@@ -10,9 +10,10 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'ButtonUnstyled',
-    'Input',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
+    // 'Input',
     'MenuItem',
     'Post',
     'UserCard'
diff --git a/src/components/status/post.style.js b/src/components/status/post.style.js
index d0038424e..491f12164 100644
--- a/src/components/status/post.style.js
+++ b/src/components/status/post.style.js
@@ -9,12 +9,12 @@ export default {
     'Link',
     'Icon',
     'Border',
-    'Button',
-    'ButtonUnstyled',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
     'RichContent',
     'Input',
     'Avatar',
-    'Attachment',
     'PollGraph'
   ],
   validInnerComponentsLite: [
diff --git a/src/components/top_bar.style.js b/src/components/top_bar.style.js
index 945ae7781..5aaace639 100644
--- a/src/components/top_bar.style.js
+++ b/src/components/top_bar.style.js
@@ -5,8 +5,9 @@ export default {
     'Link',
     'Text',
     'Icon',
-    'Button',
-    'ButtonUnstyled',
+    // Optimization: don't put heavy components unless needed
+    // '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 3d5bb2989..2d26385f2 100644
--- a/src/components/user_card/user_card.style.js
+++ b/src/components/user_card/user_card.style.js
@@ -6,8 +6,9 @@ export default {
     'Text',
     'Link',
     'Icon',
-    'Button',
-    'ButtonUnstyled',
+    // Optimization: don't put heavy components unless needed
+    // 'Button',
+    // 'ButtonUnstyled',
     'Input',
     'RichContent',
     'Alert'
diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js
index 9de1aca3c..0c3383283 100644
--- a/src/services/theme_data/theme2_to_theme3.js
+++ b/src/services/theme_data/theme2_to_theme3.js
@@ -244,9 +244,6 @@ export const convertTheme2To3 = (data) => {
         case 'tooltip':
           rule.component = 'Popover'
           break
-        case 'attachment':
-          rule.component = 'Attachment'
-          break
         case 'ChatMessage':
           rule.component = 'Button'
           break
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index b85d917de..78aad4488 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -33,7 +33,6 @@ const components = {
   Icon: null,
   Border: null,
   PanelHeader: null,
-  Attachment: null,
   Panel: null,
   Chat: null,
   ChatMessage: null,