diff --git a/src/enginuity/io/protocol/SSMChecksumCalculator.java b/src/enginuity/io/protocol/SSMChecksumCalculator.java
index e3b5c049..dd9fda16 100644
--- a/src/enginuity/io/protocol/SSMChecksumCalculator.java
+++ b/src/enginuity/io/protocol/SSMChecksumCalculator.java
@@ -25,7 +25,9 @@ import static enginuity.util.ByteUtil.asByte;
 import static enginuity.util.ByteUtil.asInt;
 
 public final class SSMChecksumCalculator {
+
     private SSMChecksumCalculator() {
+        throw new UnsupportedOperationException();
     }
 
     public static byte calculateChecksum(byte[] bytes) {
diff --git a/src/enginuity/io/protocol/SSMProtocol.java b/src/enginuity/io/protocol/SSMProtocol.java
index 6baca10c..cb274a59 100644
--- a/src/enginuity/io/protocol/SSMProtocol.java
+++ b/src/enginuity/io/protocol/SSMProtocol.java
@@ -21,7 +21,6 @@
 
 package enginuity.io.protocol;
 
-import enginuity.io.connection.ConnectionProperties;
 import static enginuity.io.protocol.SSMChecksumCalculator.calculateChecksum;
 import static enginuity.io.protocol.SSMResponseProcessor.extractResponseData;
 import static enginuity.io.protocol.SSMResponseProcessor.filterRequestFromResponse;
@@ -89,35 +88,6 @@ public final class SSMProtocol implements Protocol {
         return new SSMEcuInit(responseData);
     }
 
-    public ConnectionProperties getConnectionProperties() {
-        return new ConnectionProperties() {
-
-            public int getBaudRate() {
-                return 4800;
-            }
-
-            public int getDataBits() {
-                return 8;
-            }
-
-            public int getStopBits() {
-                return 1;
-            }
-
-            public int getParity() {
-                return 0;
-            }
-
-            public int getConnectTimeout() {
-                return 2000;
-            }
-
-            public int getSendTimeout() {
-                return 55;
-            }
-        };
-    }
-
     //TODO: Clean up SSM request building... pretty ugly at the moment..
     private byte[] buildRequest(byte command, boolean padContent, byte[]... content) {
         byte[] data = new byte[0];
diff --git a/src/enginuity/io/protocol/SSMResponseProcessor.java b/src/enginuity/io/protocol/SSMResponseProcessor.java
index 49efc85d..0d28943d 100644
--- a/src/enginuity/io/protocol/SSMResponseProcessor.java
+++ b/src/enginuity/io/protocol/SSMResponseProcessor.java
@@ -36,7 +36,9 @@ import static enginuity.util.ParamChecker.checkNotNull;
 import static enginuity.util.ParamChecker.checkNotNullOrEmpty;
 
 public final class SSMResponseProcessor {
+
     private SSMResponseProcessor() {
+        throw new UnsupportedOperationException();
     }
 
     public static byte[] filterRequestFromResponse(byte[] request, byte[] response) {