diff --git a/BenchtopParser/I28.cs b/BenchtopParser/I28.cs
deleted file mode 100644
index 87dd6b2..0000000
--- a/BenchtopParser/I28.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace BenchtopParser {
-    public class I28 {
-        public static ProgramConfig Load_ProgramConfig(String program_config_value) {
-            ProgramConfig pc = new ProgramConfig(program_config_value);
-            return pc;
-        }
-
-        public static TransducerVerify Load_TransducerVerify(String transducer_verify_value) {
-            TransducerVerify tv = new TransducerVerify(transducer_verify_value);
-            return tv;
-        }
-    }
-}
\ No newline at end of file
diff --git a/BenchtopParserTests/Program_Config_Tests.cs b/BenchtopParserTests/Program_Config_Tests.cs
index 84cce74..5db233b 100644
--- a/BenchtopParserTests/Program_Config_Tests.cs
+++ b/BenchtopParserTests/Program_Config_Tests.cs
@@ -11,7 +11,7 @@ namespace BenchtopParserTests {
 
         [Test]
         public void Test_ProgramConfig() {
-            var programConfigs = BenchtopParser.I28.Load_ProgramConfig(program_config_value);
+            var programConfigs = new BenchtopParser.ProgramConfig(program_config_value);
             Assert.IsNotNull(programConfigs);
 
             // Check that group collecting works - 
@@ -25,13 +25,13 @@ namespace BenchtopParserTests {
 
         [Test]
         public void Test_ProgramConfig_Throw_ErrorOrder() {
-            Exception ex = Assert.Throws<Exception>(delegate { BenchtopParser.I28.Load_ProgramConfig("EBAE006	L	1,P1"); });
+            Exception ex = Assert.Throws<Exception>(delegate { new BenchtopParser.ProgramConfig("EBAE006	L	1,P1"); });
             Assert.That(ex.Message, Is.EqualTo("Setting Program Number Before Start. Error In Config"));
         }
 
         [Test]
         public void Test_ProgramConfig_Throw_InvalidProgram() {
-            Exception ex = Assert.Throws<Exception>(delegate { BenchtopParser.I28.Load_ProgramConfig("broken"); });
+            Exception ex = Assert.Throws<Exception>(delegate { new BenchtopParser.ProgramConfig("broken"); });
             Assert.That(ex.Message, Is.EqualTo("Invalid Program Config, please provide an I28 Program Config file data"));
         }
     }
diff --git a/BenchtopParserTests/Transducer_Verify_Tests.cs b/BenchtopParserTests/Transducer_Verify_Tests.cs
index 54defc0..b77dcdc 100644
--- a/BenchtopParserTests/Transducer_Verify_Tests.cs
+++ b/BenchtopParserTests/Transducer_Verify_Tests.cs
@@ -10,14 +10,14 @@ namespace BenchtopParserTests {
 
         [Test]
         public void Test_TransducerVerify() {
-            BenchtopParser.TransducerVerify tv = BenchtopParser.I28.Load_TransducerVerify(transducer_verify_value);
+            BenchtopParser.TransducerVerify tv = new BenchtopParser.TransducerVerify(transducer_verify_value);
             Assert.That(tv.transducers[1].id, Is.EqualTo(1));
             Assert.That(tv.transducers[1].name, Is.EqualTo("CTS D34-442 115PSIA"));
         }
 
         [Test]
         public void Test_TransducerVerify_Throw_InvalidProgram() {
-            Exception ex = Assert.Throws<Exception>(delegate { BenchtopParser.I28.Load_TransducerVerify("broken"); });
+            Exception ex = Assert.Throws<Exception>(delegate { new BenchtopParser.TransducerVerify("broken"); });
             Assert.That(ex.Message, Is.EqualTo("Invalid Transducer Verify Report, please provide a Transducer Verify Report file data"));
         }
     }