diff --git a/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClient.java b/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClient.java
index 2c478ec..95e7789 100755
--- a/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClient.java
+++ b/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClient.java
@@ -30,81 +30,81 @@
      *
      * @param msg the message to write
      */
-    public void sendMessage(PcepMessage msg);
+    void sendMessage(PcepMessage msg);
 
     /**
      * Writes the PcepMessage list to the driver.
      *
      * @param msgs the messages to be written
      */
-    public void sendMessage(List<PcepMessage> msgs);
+    void sendMessage(List<PcepMessage> msgs);
 
     /**
      * Handle a message from the pcc.
      *
      * @param fromClient the message to handle
      */
-    public void handleMessage(PcepMessage fromClient);
+    void handleMessage(PcepMessage fromClient);
 
     /**
      * Provides the factory for this PCEP version.
      *
      * @return PCEP version specific factory.
      */
-    public PcepFactory factory();
+    PcepFactory factory();
 
     /**
      * Gets a string version of the ID for this pcc.
      *
      * @return string version of the ID
      */
-    public String getStringId();
+    String getStringId();
 
     /**
      * Gets the ipAddress of the client.
      *
      * @return the client pccId in IPAddress format
      */
-    public PccId getPccId();
+    PccId getPccId();
 
     /**
      * Checks if the pcc is still connected.
      *
      * @return true if client is connected, false otherwise
      */
-    public boolean isConnected();
+    boolean isConnected();
 
     /**
      * Disconnects the pcc by closing the TCP connection. Results in a call
      * to the channel handler's channelDisconnected method for cleanup.
      */
-    public void disconnectClient();
+    void disconnectClient();
 
     /**
      * Indicates if this pcc is optical.
      *
      * @return true if optical
      */
-    public boolean isOptical();
+    boolean isOptical();
 
     /**
      * Identifies the channel used to communicate with the pcc.
      *
      * @return string representation of the connection to the client
      */
-    public String channelId();
+    String channelId();
 
     /**
      * To set the status of state synchronization.
      *
      * @param value to set the synchronization status
      */
-    public void setIsSyncComplete(boolean value);
+    void setIsSyncComplete(boolean value);
 
     /**
      * Indicates the state synchronization status of this pcc.
      *
      * @return true/false if the synchronization is completed/not completed
      */
-    public boolean isSyncComplete();
+    boolean isSyncComplete();
 }
diff --git a/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClientListener.java b/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClientListener.java
index 3f7e0f0..e7e0a73 100755
--- a/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClientListener.java
+++ b/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepClientListener.java
@@ -25,12 +25,12 @@
      *
      * @param pccId the id of the client that connected
      */
-    public void clientConnected(PccId pccId);
+    void clientConnected(PccId pccId);
 
     /**
      * Notify that the PCC was disconnected.
      *
      * @param pccId the id of the client that disconnected.
      */
-    public void clientDisconnected(PccId pccId);
+    void clientDisconnected(PccId pccId);
 }
diff --git a/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepEventListener.java b/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepEventListener.java
index 5abe7df..f7de215 100644
--- a/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepEventListener.java
+++ b/pcep/api/src/main/java/org/onosproject/pcep/controller/PcepEventListener.java
@@ -27,5 +27,5 @@
      * @param pccId id of the pcc
      * @param msg the message
      */
-    public void handleMessage(PccId pccId, PcepMessage msg);
+    void handleMessage(PccId pccId, PcepMessage msg);
 }
diff --git a/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepAgent.java b/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepAgent.java
index 71ed834..4810417 100755
--- a/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepAgent.java
+++ b/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepAgent.java
@@ -33,7 +33,7 @@
      * @param pc the actual pce client object.
      * @return true if added, false otherwise.
      */
-    public boolean addConnectedClient(PccId pccId, PcepClient pc);
+    boolean addConnectedClient(PccId pccId, PcepClient pc);
 
     /**
      * Checks if the activation for this pcc client is valid.
@@ -41,7 +41,7 @@
      * @param pccId the id of pcc client to check
      * @return true if valid, false otherwise
      */
-    public boolean validActivation(PccId pccId);
+    boolean validActivation(PccId pccId);
 
     /**
      * Clear all state in controller client maps for a pcc client that has
@@ -50,7 +50,7 @@
      *
      * @param pccIds the id of pcc client to remove.
      */
-    public void removeConnectedClient(PccId pccIds);
+    void removeConnectedClient(PccId pccIds);
 
     /**
      * Process a message coming from a pcc client.
@@ -58,6 +58,6 @@
      * @param pccId the id of pcc client the message was received.
      * @param m the message to process
      */
-    public void processPcepMessage(PccId pccId, PcepMessage m);
+    void processPcepMessage(PccId pccId, PcepMessage m);
 
 }
diff --git a/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriver.java b/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriver.java
index 16d0b0b..f728de5 100755
--- a/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriver.java
+++ b/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriver.java
@@ -34,33 +34,33 @@
      *
      * @param agent the agent to set.
      */
-    public void setAgent(PcepAgent agent);
+    void setAgent(PcepAgent agent);
 
     /**
      * Announce to the Pcep agent that this pcc client has connected.
      *
      * @return true if successful, false if duplicate switch.
      */
-    public boolean connectClient();
+    boolean connectClient();
 
     /**
      * Remove this pcc client from the Pcep agent.
      */
-    public void removeConnectedClient();
+    void removeConnectedClient();
 
     /**
      * Sets the PCEP version for this pcc.
      *
      * @param pcepVersion the version to set.
      */
-    public void setPcVersion(PcepVersion pcepVersion);
+    void setPcVersion(PcepVersion pcepVersion);
 
     /**
      * Sets the associated Netty channel for this pcc.
      *
      * @param channel the Netty channel
      */
-    public void setChannel(Channel channel);
+    void setChannel(Channel channel);
 
 
     /**
@@ -68,28 +68,28 @@
      *
      * @param keepAliveTime the keep alive time to set.
      */
-    public void setPcKeepAliveTime(byte keepAliveTime);
+    void setPcKeepAliveTime(byte keepAliveTime);
 
     /**
      * Sets the dead time for this pcc.
      *
      * @param deadTime the dead timer value to set.
      */
-    public void setPcDeadTime(byte deadTime);
+    void setPcDeadTime(byte deadTime);
 
     /**
      * Sets the session id for this pcc.
      *
      * @param sessionId the session id value to set.
      */
-    public void setPcSessionId(byte sessionId);
+    void setPcSessionId(byte sessionId);
 
     /**
      * Sets whether the pcc is connected.
      *
      * @param connected whether the pcc is connected
      */
-    public void setConnected(boolean connected);
+    void setConnected(boolean connected);
 
     /**
      * Initializes the behavior.
diff --git a/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriverFactory.java b/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriverFactory.java
index d1e4733..6ce75bc 100755
--- a/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriverFactory.java
+++ b/pcep/api/src/main/java/org/onosproject/pcep/controller/driver/PcepClientDriverFactory.java
@@ -33,6 +33,6 @@
      * @param pcepVersion the Pcep version in use
      * @return the Pcep client representation.
      */
-    public PcepClientDriver getPcepClientImpl(IpAddress pccIpAddress,
+    PcepClientDriver getPcepClientImpl(IpAddress pccIpAddress,
             PcepVersion pcepVersion);
 }