diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
index 8ff15ea34..da9d2678b 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
@@ -36,8 +36,7 @@ import java.util.List;
 /**
  * Interface for Admin operations persisting. This interface accepts operations added via UI.
  */
-@Api(value = "Windows Device Management Administrative Service",
-        description = "Device management related admin APIs.")
+
 
 @SwaggerDefinition(
         info = @Info(
@@ -56,6 +55,8 @@ import java.util.List;
                 @Tag(name = "devicemgt_windows", description = "")
         }
 )
+@Api(value = "Windows Device Management Administrative Service",
+        description = "Device management related admin APIs.")
 @WebService
 @Path("/admin/devices")
 @Consumes(MediaType.APPLICATION_JSON)
@@ -367,7 +368,6 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while adding adding a lock-reset operation.")
     })
-    //
     Response lockReset(@HeaderParam("Accept") String acceptHeader, @ApiParam(
             name = "deviceIDs",
             value = "Provide the ID of the A Windows device. Multiple device IDs can be added by " +
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index d0b24e3c3..3442b5ee8 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -97,22 +97,14 @@
     <jaxrs:server id="Syncmlinitial" address="/syncml">
         <jaxrs:serviceBeans>
             <ref bean="Syncml_initial_bean"/>
-            <ref bean="swaggerResource"/>
         </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <ref bean="swaggerWriter"/>
-        </jaxrs:providers>
     </jaxrs:server>
 
     <!--BST provider Endpoint for returning binary security token after authentication-->
     <jaxrs:server id="bstprovider" address="/federated">
         <jaxrs:serviceBeans>
             <ref bean="bstProviderService"/>
-            <ref bean="swaggerResource"/>
         </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <ref bean="swaggerWriter"/>
-        </jaxrs:providers>
     </jaxrs:server>
 
     <!--Endpoint for UI admin operations-->