diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/Subnet.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/Subnet.java
index ca3fce8..f563a78 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/Subnet.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/Subnet.java
@@ -27,7 +27,7 @@
     /**
      * Coarse classification of the type of the ipV6Mode.
      */
-    public enum Mode {
+    enum Mode {
         DHCPV6_STATEFUL, DHCPV6_STATELESS, SLAAC
     }
 
diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/TenantNetwork.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/TenantNetwork.java
index 5118ece..256352f 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/TenantNetwork.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/TenantNetwork.java
@@ -23,7 +23,7 @@
     /**
      * Coarse classification of the state of the tenantNetwork.
      */
-    public enum State {
+    enum State {
         /**
          * Signifies that a tenantNetwork is currently active.This state means
          * that this network is available.
@@ -46,7 +46,7 @@
     /**
      * Coarse classification of the type of the tenantNetwork.
      */
-    public enum Type {
+    enum Type {
         /**
          * Signifies that a tenantNetwork is local.
          */
diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java
index 7886224..d2d7c14 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPort.java
@@ -28,7 +28,7 @@
     /**
      * Coarse classification of the type of the virtual port.
      */
-    public enum State {
+    enum State {
         /**
          * Signifies that a virtualPort is currently active,This state mean that
          * this virtualPort is available.
@@ -37,7 +37,7 @@
         /**
          * Signifies that a virtualPort is currently unavailable.
          */
-        DOWN
+        DOWN;
     }
 
     /**
diff --git a/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
index 3cfc936..2f74ae6 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
@@ -23,7 +23,7 @@
 public interface ControllerNode {
 
     /** Represents the operational state of the instance. */
-    public enum State {
+    enum State {
         /**
          * Signifies that the instance is active and operating normally.
          */
diff --git a/core/api/src/main/java/org/onosproject/core/CoreService.java b/core/api/src/main/java/org/onosproject/core/CoreService.java
index 3dfc6b2..303ad39 100644
--- a/core/api/src/main/java/org/onosproject/core/CoreService.java
+++ b/core/api/src/main/java/org/onosproject/core/CoreService.java
@@ -27,12 +27,12 @@
     /**
      * Name of the core "application".
      */
-    static final String CORE_APP_NAME = "org.onosproject.core";
+    String CORE_APP_NAME = "org.onosproject.core";
 
     /**
      * Identifier of the core "provider".
      */
-    static final ProviderId CORE_PROVIDER_ID = new ProviderId("core", CORE_APP_NAME);
+    ProviderId CORE_PROVIDER_ID = new ProviderId("core", CORE_APP_NAME);
 
     /**
      * Returns the product version.
diff --git a/core/api/src/main/java/org/onosproject/core/MetricsHelper.java b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
index b5be094..8de0543 100644
--- a/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
+++ b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
@@ -32,7 +32,7 @@
      *
      * @return MetricService instance
      */
-    abstract MetricsService metricsService();
+    MetricsService metricsService();
 
 
     /**
diff --git a/core/api/src/main/java/org/onosproject/net/Device.java b/core/api/src/main/java/org/onosproject/net/Device.java
index d900182..ffbf7f9 100644
--- a/core/api/src/main/java/org/onosproject/net/Device.java
+++ b/core/api/src/main/java/org/onosproject/net/Device.java
@@ -25,7 +25,7 @@
     /**
      * Coarse classification of the type of the infrastructure device.
      */
-    public enum Type {
+    enum Type {
         SWITCH, ROUTER, ROADM, OTN, ROADM_OTN, FIREWALL, BALANCER, IPS, IDS, CONTROLLER,
         VIRTUAL, FIBER_SWITCH, MICROWAVE, OTHER
     }
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
index e446a9f..a487cbc 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
@@ -25,8 +25,8 @@
  */
 public interface FlowRule {
 
-    static final int MAX_TIMEOUT = 60;
-    static final int MIN_PRIORITY = 0;
+    int MAX_TIMEOUT = 60;
+    int MIN_PRIORITY = 0;
 
     /**
      * The FlowRule type is used to determine in which table the flow rule needs
@@ -36,7 +36,7 @@
      * @deprecated in Cardinal Release
      */
     @Deprecated
-    static enum Type {
+    enum Type {
         /*
          * Default type - used in flow rule for single table switch NOTE: this
          * setting should not be used as Table 0 in a multi-table pipeline
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
index e297115..d4f959c 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
@@ -32,7 +32,7 @@
     /**
      * The topic used for obtaining globally unique ids.
      */
-    static String FLOW_OP_TOPIC = "flow-ops-ids";
+    String FLOW_OP_TOPIC = "flow-ops-ids";
 
     /**
      * Returns the number of flow rules in the system.
diff --git a/core/api/src/main/java/org/onosproject/net/flowobjective/Objective.java b/core/api/src/main/java/org/onosproject/net/flowobjective/Objective.java
index 090c298..6ac7a7a 100644
--- a/core/api/src/main/java/org/onosproject/net/flowobjective/Objective.java
+++ b/core/api/src/main/java/org/onosproject/net/flowobjective/Objective.java
@@ -26,9 +26,9 @@
 @Beta
 public interface Objective {
 
-    static final boolean DEFAULT_PERMANENT = true;
-    static final int DEFAULT_TIMEOUT = 0;
-    static final int DEFAULT_PRIORITY = 32768;
+    boolean DEFAULT_PERMANENT = true;
+    int DEFAULT_TIMEOUT = 0;
+    int DEFAULT_PRIORITY = 32768;
 
     /**
      * Type of operation.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketPriority.java b/core/api/src/main/java/org/onosproject/net/packet/PacketPriority.java
index 68c0a83..3eab938 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketPriority.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketPriority.java
@@ -34,7 +34,7 @@
 
     private final int priorityValue;
 
-    private PacketPriority(int priorityValue) {
+    PacketPriority(int priorityValue) {
         this.priorityValue = priorityValue;
     }
 
@@ -50,4 +50,4 @@
     public String toString() {
         return String.valueOf(priorityValue);
     }
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
index 9888677..e700d62 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
@@ -22,8 +22,8 @@
  */
 public interface PacketProcessor {
 
-    static final int ADVISOR_MAX = Integer.MAX_VALUE / 3;
-    static final int DIRECTOR_MAX = (Integer.MAX_VALUE / 3) * 2;
+    int ADVISOR_MAX = Integer.MAX_VALUE / 3;
+    int DIRECTOR_MAX = (Integer.MAX_VALUE / 3) * 2;
     static final int OBSERVER_MAX = Integer.MAX_VALUE;
 
     /**
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseUpdate.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseUpdate.java
index 8cac596..a62d382 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseUpdate.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseUpdate.java
@@ -31,7 +31,7 @@
     /**
      * Type of database update operation.
      */
-    public static enum Type {
+    public enum Type {
         /**
          * Insert/Update entry without any checks.
          */