diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
index 9498fbb9f..f5b9ce1fa 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
@@ -76,8 +76,6 @@ public String getValue() {
     private SecurityLevel level;
     @Getter @Setter
     private ASN1Boolean plus;
-    @Getter
-    private ASN1Sequence asn1Sequence;
 
     /**
      * Default constructor.
@@ -111,8 +109,6 @@ public FIPSLevel(final ASN1Sequence sequence) throws IllegalArgumentException {
         if (sequence.size() == MAX_SEQUENCE_SIZE) {
             plus = ASN1Boolean.getInstance(sequence.getObjectAt(2));
         }
-
-        this.asn1Sequence = sequence;
     }
 
     @Override
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java
index ae732761e..618db8e10 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TBBSecurityAssertion.java
@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
 import org.bouncycastle.asn1.ASN1Boolean;
 import org.bouncycastle.asn1.ASN1Enumerated;
 import org.bouncycastle.asn1.ASN1Integer;
@@ -86,9 +85,7 @@ public enum MeasurementRootType {
     }
 
     private ASN1Integer version;
-    @Getter @Setter
     private CommonCriteriaMeasures ccInfo;
-    @Getter @Setter
     private FIPSLevel fipsLevel;
     private MeasurementRootType rtmType;
     private ASN1Boolean iso9000Certified;
@@ -185,6 +182,34 @@ public void setVersion(final ASN1Integer version) {
         this.version = version;
     }
 
+    /**
+     * @return the ccInfo
+     */
+    public CommonCriteriaMeasures getCcInfo() {
+        return ccInfo;
+    }
+
+    /**
+     * @param ccInfo the ccInfo to set
+     */
+    public void setCcInfo(final CommonCriteriaMeasures ccInfo) {
+        this.ccInfo = ccInfo;
+    }
+
+    /**
+     * @return the fipsLevel
+     */
+    public FIPSLevel getFipsLevel() {
+        return fipsLevel;
+    }
+
+    /**
+     * @param fipsLevel the fipsLevel to set
+     */
+    public void setFipsLevel(final FIPSLevel fipsLevel) {
+        this.fipsLevel = fipsLevel;
+    }
+
     /**
      * @return the rtmType
      */