diff --git a/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java b/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java
index c065164b..93111f6b 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/HexUtils.java
@@ -1,14 +1,14 @@
 package hirs.utils;
 
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
+//import lombok.AccessLevel;
+//import lombok.NoArgsConstructor;
 
 import java.math.BigInteger;
 
 /**
  * Utilities for working with hex strings and byte arrays.
  */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
+//@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class HexUtils {
 
     /**
diff --git a/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java b/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
index 6ca10ae7..770808ea 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/JsonUtils.java
@@ -2,8 +2,8 @@ package hirs.utils;
 
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonObject;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
+//import lombok.AccessLevel;
+//import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
 import java.io.FileInputStream;
@@ -20,7 +20,7 @@ import java.nio.file.Path;
  * library.
  */
 @Log4j2
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
+//@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class JsonUtils {
 
     /**