diff --git a/assets/styles/components/_media.less b/assets/styles/components/_media.less
deleted file mode 100644
index 4918f7b..0000000
--- a/assets/styles/components/_media.less
+++ /dev/null
@@ -1,13 +0,0 @@
-// Captions
-.wp-caption {
-  &:extend(.thumbnail all);
-}
-
-.wp-caption-text {
-  &:extend(.thumbnail .caption all);
-}
-
-// Gallery shortcode
-.gallery-row {
-  padding: (@line-height-computed / 2) 0;
-}
diff --git a/assets/styles/components/_wp-classes.less b/assets/styles/components/_wp-classes.less
index d800dfc..1e8953a 100644
--- a/assets/styles/components/_wp-classes.less
+++ b/assets/styles/components/_wp-classes.less
@@ -1,6 +1,11 @@
 // WordPress Generated Classes
 // http://codex.wordpress.org/CSS#WordPress_Generated_Classes
 
+.alignnone {
+  margin-left: 0;
+  margin-right: 0;
+  max-width: 100%;
+}
 .aligncenter {
   display: block;
   margin: (@line-height-computed / 2) auto;
@@ -10,7 +15,7 @@
   margin-bottom: (@line-height-computed / 2);
 }
 @media (min-width: @screen-sm-min) {
-  // Only float images if not on an extra small device like smartphones
+  // Only float if not on an extra small device
   .alignleft {
     float: left;
     margin-right: (@line-height-computed / 2);
@@ -21,12 +26,15 @@
   }
 }
 
-figure.alignnone {
-  margin-left: 0;
-  margin-right: 0;
-  max-width: 100%;
+// Captions
+.wp-caption {
+  &:extend(.thumbnail all);
+}
+.wp-caption-text {
+  &:extend(.thumbnail .caption all);
 }
 
+// Text meant only for screen readers
 .screen-reader-text {
   &:extend(.sr-only all);
   &:extend(.sr-only-focusable all);
diff --git a/assets/styles/main.less b/assets/styles/main.less
index 6087756..0c8fb22 100644
--- a/assets/styles/main.less
+++ b/assets/styles/main.less
@@ -7,7 +7,6 @@
 @import "components/_buttons";
 @import "components/_comments";
 @import "components/_forms";
-@import "components/_media";
 @import "components/_wp-classes";
 @import "layouts/_general";
 @import "layouts/_header";