diff --git a/src/main/java/com/beanit/iec61850bean/ClientAssociation.java b/src/main/java/com/beanit/iec61850bean/ClientAssociation.java
index a8436ab..ce82a87 100644
--- a/src/main/java/com/beanit/iec61850bean/ClientAssociation.java
+++ b/src/main/java/com/beanit/iec61850bean/ClientAssociation.java
@@ -99,12 +99,12 @@ import java.util.concurrent.TimeoutException;
 public final class ClientAssociation {
 
   private static final Integer16 version = new Integer16(new byte[] {(byte) 0x01, (byte) 0x01});
+  private static final ParameterSupportOptions proposedParameterCbbBitString =
+      new ParameterSupportOptions(new byte[] {0x03, 0x05, (byte) 0xf1, 0x00});
   private final ClientReceiver clientReceiver;
   private final BlockingQueue<MMSpdu> incomingResponses = new LinkedBlockingQueue<>();
   private final ReverseByteArrayOutputStream reverseOStream =
       new ReverseByteArrayOutputStream(500, true);
-  private static ParameterSupportOptions proposedParameterCbbBitString =
-		  new ParameterSupportOptions(new byte[] {0x03, 0x05, (byte) 0xf1, 0x00});
   ServerModel serverModel;
   private AcseAssociation acseAssociation = null;
   private int responseTimeout;
@@ -582,15 +582,6 @@ public final class ClientAssociation {
   public void setServerModel(ServerModel model) {
     this.serverModel = model;
   }
-  
-  /**
-   * Set the ProposedParameterCbbBitString parameter, default is byte[] {0x03, 0x05, (byte) 0xf1, 0x00}.
-   * 
-   * @param proposedParameterCbbBitString the new Proposed Parameter Cbb-Bit-String
-   */
-  public static void setProposedParameterCbbBitString(ParameterSupportOptions proposedParameterCbbBitString) {
-	ClientAssociation.proposedParameterCbbBitString = proposedParameterCbbBitString;
-  }
 
   /**
    * Triggers all GetDirectory and GetDefinition ACSI services needed to get the complete server
diff --git a/src/main/java/com/beanit/iec61850bean/ClientSap.java b/src/main/java/com/beanit/iec61850bean/ClientSap.java
index a30ab68..c67f771 100644
--- a/src/main/java/com/beanit/iec61850bean/ClientSap.java
+++ b/src/main/java/com/beanit/iec61850bean/ClientSap.java
@@ -13,13 +13,11 @@
  */
 package com.beanit.iec61850bean;
 
+import com.beanit.josistack.ClientAcseSap;
 import java.io.IOException;
 import java.net.InetAddress;
-
 import javax.net.SocketFactory;
 
-import com.beanit.josistack.ClientAcseSap;
-
 /**
  * The <code>ClientSap</code> class represents the IEC 61850 service access point for client
  * applications. A client application that wants to connect to a server should first create an
@@ -92,31 +90,19 @@ public final class ClientSap {
       throw new IllegalArgumentException("maximum size is out of bound");
     }
   }
-  
-  public int getProposedMaxServOutstandingCalling() {
-	return proposedMaxServOutstandingCalling;
-  }
-  
+
   public void setProposedMaxServOutstandingCalling(int proposedMaxServOutstandingCalling) {
-	this.proposedMaxServOutstandingCalling = proposedMaxServOutstandingCalling;
+    this.proposedMaxServOutstandingCalling = proposedMaxServOutstandingCalling;
   }
 
-  public int getProposedMaxServOutstandingCalled() {
-	return proposedMaxServOutstandingCalled;
-  }
-  
   public void setProposedMaxServOutstandingCalled(int proposedMaxServOutstandingCalled) {
-	this.proposedMaxServOutstandingCalled = proposedMaxServOutstandingCalled;
+    this.proposedMaxServOutstandingCalled = proposedMaxServOutstandingCalled;
   }
 
-  public int getProposedDataStructureNestingLevel() {
-	return proposedDataStructureNestingLevel;
-  }
-  
   public void setProposedDataStructureNestingLevel(int proposedDataStructureNestingLevel) {
-	this.proposedDataStructureNestingLevel = proposedDataStructureNestingLevel;
+    this.proposedDataStructureNestingLevel = proposedDataStructureNestingLevel;
   }
-  
+
   /**
    * Gets the ServicesSupportedCalling parameter.
    *