diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less
index 050c83f1d..fa722f930 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -1,22 +1,6 @@
 @import 'minerva.variables';
 @import 'minerva.mixins';
 
-// hide menu items when not possible to use
-.client-nojs #ca-watch,
-#ca-talk.selected {
-	// Important as this is not negotiable.
-	display: none !important;
-}
-
-.client-nojs #ca-edit {
-	// This is negotiable as non-JS editing might be enabled.
-	display: none;
-}
-
-#page-actions .nojs-edit {
-	display: inline-block;
-}
-
 .heading-holder {
 	@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
 	padding: @titleSectionSpacingTop 0 (@pageActionsHeight + 0.5em);
diff --git a/resources/skins.minerva.content.styles/text.less b/resources/skins.minerva.content.styles/text.less
index 6cef3d488..5b8bef0b4 100644
--- a/resources/skins.minerva.content.styles/text.less
+++ b/resources/skins.minerva.content.styles/text.less
@@ -62,7 +62,7 @@ pre {
 	padding: 1em;
 }
 
-.mw-ref,
+.mw-ref, // For Parsoid content (e.g. mediawiki.skinning.content.parsoid)
 sup {
 	vertical-align: super;
 }
@@ -71,7 +71,7 @@ sub {
 	vertical-align: sub;
 }
 
-.mw-ref,
+.mw-ref, // For Parsoid content (e.g. mediawiki.skinning.content.parsoid)
 sub,
 sup {
 	font-size: 0.75em;
diff --git a/resources/skins.minerva.editor/init.js b/resources/skins.minerva.editor/init.js
index b0af248e4..8ce945e62 100644
--- a/resources/skins.minerva.editor/init.js
+++ b/resources/skins.minerva.editor/init.js
@@ -279,8 +279,6 @@
 		// Make sure we never create two edit links by accident
 		// FIXME: split the selector and cache it
 		if ( $caEdit.find( '.edit-page' ).length === 0 ) {
-			$( '.nojs-edit' ).removeClass( 'nojs-edit' );
-
 			if ( isNewPage ||
 					( leadSection && leadSection.text() ) || page.getSections().length === 0 ) {
 				// if lead section is not empty, open editor with lead section
diff --git a/resources/skins.minerva.tablet.styles/common.less b/resources/skins.minerva.tablet.styles/common.less
index 4a3ca97b8..86b5e28d3 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -49,11 +49,6 @@ A file for css that optimises the Minerva skin on larger devices.
 		}
 	}
 
-	.content_block {
-		width: auto;
-		clear: none;
-	}
-
 	// FIXME: Have a class that identifies all of these selectors
 	.pre-content,
 	// Form only pages e.g. Special:MobileOptions