diff --git a/authorize/pom.xml b/authorize/pom.xml
index ec7ad126..7395b52f 100644
--- a/authorize/pom.xml
+++ b/authorize/pom.xml
@@ -117,18 +117,6 @@
             <artifactId>server</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>openapi-parser</artifactId>
diff --git a/cache/pom.xml b/cache/pom.xml
index f1d95579..3dc4cc2c 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -104,23 +104,6 @@
             <artifactId>server</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-parser</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/cache/src/main/java/com/networknt/oauth/cache/model/Client.java b/cache/src/main/java/com/networknt/oauth/cache/model/Client.java
index b43d0ccb..4d792528 100644
--- a/cache/src/main/java/com/networknt/oauth/cache/model/Client.java
+++ b/cache/src/main/java/com/networknt/oauth/cache/model/Client.java
@@ -7,7 +7,6 @@
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -114,7 +113,6 @@ public Client clientId(String clientId) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "a unique client id")
   @JsonProperty("clientId")
   public String getClientId() {
     return clientId;
@@ -129,7 +127,6 @@ public Client clientSecret(String clientSecret) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "client secret")
   @JsonProperty("clientSecret")
   public String getClientSecret() {
     return clientSecret;
@@ -144,7 +141,6 @@ public Client clientType(ClientTypeEnum clientType) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "client type")
   @JsonProperty("clientType")
   public ClientTypeEnum getClientType() {
     return clientType;
@@ -159,7 +155,6 @@ public Client clientProfile(ClientProfileEnum clientProfile) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "client profile")
   @JsonProperty("clientProfile")
   public ClientProfileEnum getClientProfile() {
     return clientProfile;
@@ -174,7 +169,6 @@ public Client clientName(String clientName) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "client name")
   @JsonProperty("clientName")
   public String getClientName() {
     return clientName;
@@ -189,7 +183,6 @@ public Client clientDesc(String clientDesc) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "client description")
   @JsonProperty("clientDesc")
   public String getClientDesc() {
     return clientDesc;
@@ -204,7 +197,6 @@ public Client ownerId(String ownerId) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "client owner id")
   @JsonProperty("ownerId")
   public String getOwnerId() {
     return ownerId;
@@ -219,7 +211,6 @@ public Client scope(String scope) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "client scope separated by space")
   @JsonProperty("scope")
   public String getScope() {
     return scope;
@@ -234,7 +225,6 @@ public Client customClaim(String customClaim) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "custom claim")
   @JsonProperty("customClaim")
   public String getCustomClaim() {
     return customClaim;
@@ -250,7 +240,6 @@ public Client redirectUri(String redirectUri) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "redirect uri")
   @JsonProperty("redirectUri")
   public String getRedirectUri() {
     return redirectUri;
@@ -266,7 +255,6 @@ public Client authenticateClass(String authenticateClass) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "authenticate class")
   @JsonProperty("authenticateClass")
   public String getAuthenticateClass() {
     return authenticateClass;
@@ -282,7 +270,6 @@ public Client derefClientId(String derefClientId) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "de-reference token client id")
   @JsonProperty("derefClientId")
   public String getDerefClientId() {
     return derefClientId;
diff --git a/cache/src/main/java/com/networknt/oauth/cache/model/Provider.java b/cache/src/main/java/com/networknt/oauth/cache/model/Provider.java
index 59694c8d..d9db9249 100644
--- a/cache/src/main/java/com/networknt/oauth/cache/model/Provider.java
+++ b/cache/src/main/java/com/networknt/oauth/cache/model/Provider.java
@@ -5,7 +5,6 @@
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -30,7 +29,6 @@ public Provider Provider(String providerId) {
   }
 
 
-  @ApiModelProperty(example = "null", required = true, value = "provider id")
   @JsonProperty("providerId")
   public String getProviderId() {
     return providerId;
@@ -41,7 +39,6 @@ public void setProviderId(String providerId) {
 
 
 
-  @ApiModelProperty(example = "null", required = true, value = "serverUrl")
   @JsonProperty("serverUrl")
   public String getServerUrl() {
     return serverUrl;
@@ -51,7 +48,6 @@ public void setServerUrl(String serverUrl) {
   }
 
 
-  @ApiModelProperty(example = "null", required = true, value = "uri")
   @JsonProperty("uri")
   public String getUri() {
     return uri;
@@ -61,7 +57,6 @@ public void setUri(String uri) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "provider name")
   @JsonProperty("providerName")
   public String getProviderName() {
     return providerName;
diff --git a/cache/src/main/java/com/networknt/oauth/cache/model/RefreshToken.java b/cache/src/main/java/com/networknt/oauth/cache/model/RefreshToken.java
index 2525c59c..d4b86caa 100644
--- a/cache/src/main/java/com/networknt/oauth/cache/model/RefreshToken.java
+++ b/cache/src/main/java/com/networknt/oauth/cache/model/RefreshToken.java
@@ -5,7 +5,6 @@
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -37,7 +36,6 @@ public RefreshToken refreshToken(String refreshToken) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "refresh token")
   @JsonProperty("refreshToken")
   public String getRefreshToken() {
     return refreshToken;
@@ -52,7 +50,6 @@ public RefreshToken userId(String userId) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "user id")
   @JsonProperty("userId")
   public String getUserId() {
     return userId;
@@ -68,7 +65,6 @@ public RefreshToken userType(String userType) {
   }
 
 
-  @ApiModelProperty(example = "null", required = true, value = "user type")
   @JsonProperty("userType")
   public String getUserType() {
     return userType;
@@ -85,7 +81,6 @@ public RefreshToken roles(String roles) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "user roles")
   @JsonProperty("roles")
   public String getRoles() {
     return roles;
@@ -101,7 +96,6 @@ public RefreshToken clientId(String clientId) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "client id")
   @JsonProperty("clientId")
   public String getClientId() {
     return clientId;
@@ -116,7 +110,6 @@ public RefreshToken scope(String scope) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "service scopes separated by space")
   @JsonProperty("scope")
   public String getScope() {
     return scope;
diff --git a/cache/src/main/java/com/networknt/oauth/cache/model/Service.java b/cache/src/main/java/com/networknt/oauth/cache/model/Service.java
index 57399687..06a787ba 100644
--- a/cache/src/main/java/com/networknt/oauth/cache/model/Service.java
+++ b/cache/src/main/java/com/networknt/oauth/cache/model/Service.java
@@ -7,7 +7,6 @@
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -63,7 +62,6 @@ public Service serviceId(String serviceId) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "a unique service id")
   @JsonProperty("serviceId")
   public String getServiceId() {
     return serviceId;
@@ -78,7 +76,6 @@ public Service serviceType(ServiceTypeEnum serviceType) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "service type")
   @JsonProperty("serviceType")
   public ServiceTypeEnum getServiceType() {
     return serviceType;
@@ -93,7 +90,6 @@ public Service serviceName(String serviceName) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "service name")
   @JsonProperty("serviceName")
   public String getServiceName() {
     return serviceName;
@@ -108,7 +104,6 @@ public Service serviceDesc(String serviceDesc) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "service description")
   @JsonProperty("serviceDesc")
   public String getServiceDesc() {
     return serviceDesc;
@@ -123,7 +118,6 @@ public Service ownerId(String ownerId) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "service owner userId")
   @JsonProperty("ownerId")
   public String getOwnerId() {
     return ownerId;
@@ -138,7 +132,6 @@ public Service scope(String scope) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "service scopes separated by space")
   @JsonProperty("scope")
   public String getScope() {
     return scope;
diff --git a/cache/src/main/java/com/networknt/oauth/cache/model/User.java b/cache/src/main/java/com/networknt/oauth/cache/model/User.java
index 1cb6b2a2..52910f1f 100644
--- a/cache/src/main/java/com/networknt/oauth/cache/model/User.java
+++ b/cache/src/main/java/com/networknt/oauth/cache/model/User.java
@@ -7,7 +7,6 @@
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -71,7 +70,6 @@ public User userId(String userId) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "a unique id")
   @JsonProperty("userId")
   public String getUserId() {
     return userId;
@@ -86,7 +84,6 @@ public User userType(UserTypeEnum userType) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "user type")
   @JsonProperty("userType")
   public UserTypeEnum getUserType() {
     return userType;
@@ -101,7 +98,6 @@ public User firstName(String firstName) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "first name")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -116,7 +112,6 @@ public User lastName(String lastName) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "last name")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -131,7 +126,6 @@ public User email(String email) {
   }
 
   
-  @ApiModelProperty(example = "null", required = true, value = "email address")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -146,7 +140,6 @@ public User password(String password) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "password")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -161,7 +154,6 @@ public User passwordConfirm(String passwordConfirm) {
   }
 
   
-  @ApiModelProperty(example = "null", value = "password confirm")
   @JsonProperty("passwordConfirm")
   public String getPasswordConfirm() {
     return passwordConfirm;
@@ -177,7 +169,6 @@ public User roles(String roles) {
   }
 
 
-  @ApiModelProperty(example = "null", value = "user roles")
   @JsonProperty("roles")
   public String getRoles() {
     return roles;
diff --git a/client/pom.xml b/client/pom.xml
index 9e197b55..9999d4d7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -115,18 +115,6 @@
             <artifactId>server</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
diff --git a/code/pom.xml b/code/pom.xml
index 6f9f7bb7..d1588e53 100644
--- a/code/pom.xml
+++ b/code/pom.xml
@@ -117,18 +117,6 @@
             <artifactId>server</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>openapi-parser</artifactId>
diff --git a/key/pom.xml b/key/pom.xml
index aab3a178..ebfc23c2 100644
--- a/key/pom.xml
+++ b/key/pom.xml
@@ -115,18 +115,6 @@
             <artifactId>server</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>openapi-parser</artifactId>
diff --git a/pom.xml b/pom.xml
index 8ce32648..bcef896e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,6 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.light-4j>1.6.0</version.light-4j>
-        <version.light-rest-4j>1.6.0</version.light-rest-4j>
-        <version.openapi-parser>1.6.0</version.openapi-parser>
         <version.json-schema-validator>1.0.5</version.json-schema-validator>
         <version.jackson>2.9.8</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
@@ -283,17 +281,17 @@
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>swagger-meta</artifactId>
-                <version>${version.light-rest-4j}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>swagger-security</artifactId>
-                <version>${version.light-rest-4j}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>swagger-validator</artifactId>
-                <version>${version.light-rest-4j}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
@@ -303,22 +301,22 @@
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>openapi-parser</artifactId>
-                <version>${version.openapi-parser}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>openapi-meta</artifactId>
-                <version>${version.light-rest-4j}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>openapi-security</artifactId>
-                <version>${version.light-rest-4j}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>openapi-validator</artifactId>
-                <version>${version.light-rest-4j}</version>
+                <version>${version.light-4j}</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger</groupId>
diff --git a/provider/pom.xml b/provider/pom.xml
index 20b1ce83..4a2bac5b 100644
--- a/provider/pom.xml
+++ b/provider/pom.xml
@@ -134,19 +134,6 @@
             <groupId>com.networknt</groupId>
             <artifactId>openapi-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/refresh-token/pom.xml b/refresh-token/pom.xml
index 8c1fc39a..cf72fcf2 100644
--- a/refresh-token/pom.xml
+++ b/refresh-token/pom.xml
@@ -112,19 +112,6 @@
             <groupId>com.networknt</groupId>
             <artifactId>server</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>openapi-parser</artifactId>
diff --git a/service/pom.xml b/service/pom.xml
index fd97873d..09f1e735 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -130,18 +130,6 @@
             <groupId>com.networknt</groupId>
             <artifactId>openapi-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
diff --git a/token/pom.xml b/token/pom.xml
index b5ff0bbc..c2472e8d 100644
--- a/token/pom.xml
+++ b/token/pom.xml
@@ -132,19 +132,6 @@
             <groupId>com.networknt</groupId>
             <artifactId>openapi-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/user/pom.xml b/user/pom.xml
index 41262dec..bd960eaf 100644
--- a/user/pom.xml
+++ b/user/pom.xml
@@ -130,18 +130,6 @@
             <groupId>com.networknt</groupId>
             <artifactId>openapi-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-meta</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.networknt</groupId>
-            <artifactId>swagger-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>