diff --git a/index.html b/index.html
index cfc07d6..ee3e6d1 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <title>HTML5 Test Page</title>
   </head>
   <body>
-    <div id="top" class="page" role="document">
+    <div id="top" role="document">
       <header>
         <h1>HTML5 Test Page</h1>
         <p>This is a test page filled with common HTML elements to be used to provide visual feedback whilst building CSS systems and frameworks.</p>
@@ -428,15 +428,7 @@
                 <input id="input__text2" type="number" placeholder="Enter a Number">
               </p>
               <p>
-                <label for="input__text3" class="error">Error</label>
-                <input id="input__text3" class="is-error" type="text" placeholder="Text Input">
-              </p>
-              <p>
-                <label for="input__text4" class="valid">Valid</label>
-                <input id="input__text4" class="is-valid" type="text" placeholder="Text Input">
-              </p>
-              <p>
-                <label for="input__file" class="button">File Input</label>
+                <label for="input__file">File Input</label>
                 <input id="input__file" type="file">
               </p>
             </fieldset>
@@ -467,7 +459,7 @@
             <p><a href="#top">[Top]</a></p>
             <fieldset id="forms__checkbox">
               <legend>Checkboxes</legend>
-              <ul class="list list--bare">
+              <ul>
                 <li><label for="checkbox1"><input id="checkbox1" name="checkbox" type="checkbox" checked="checked"> Choice A</label></li>
                 <li><label for="checkbox2"><input id="checkbox2" name="checkbox" type="checkbox"> Choice B</label></li>
                 <li><label for="checkbox3"><input id="checkbox3" name="checkbox" type="checkbox"> Choice C</label></li>
@@ -476,10 +468,10 @@
             <p><a href="#top">[Top]</a></p>
             <fieldset id="forms__radio">
               <legend>Radio buttons</legend>
-              <ul class="list list--bare">
-                <li><label for="radio1"><input id="radio1" name="radio" type="radio" class="radio" checked="checked"> Option 1</label></li>
-                <li><label for="radio2"><input id="radio2" name="radio" type="radio" class="radio"> Option 2</label></li>
-                <li><label for="radio3"><input id="radio3" name="radio" type="radio" class="radio"> Option 3</label></li>
+              <ul>
+                <li><label for="radio1"><input id="radio1" name="radio" type="radio" checked="checked"> Option 1</label></li>
+                <li><label for="radio2"><input id="radio2" name="radio" type="radio"> Option 2</label></li>
+                <li><label for="radio3"><input id="radio3" name="radio" type="radio"> Option 3</label></li>
               </ul>
             </fieldset>
             <p><a href="#top">[Top]</a></p>
