diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
index 9802fe30fe0..76c541d337b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
@@ -43,4 +43,10 @@ public final class DeviceManagementConstants {
         public final static String MOBILE_DEVICE_TYPE_WINDOWS = "windows";
     }
 
+    public static final class LanguageCodes{
+        private LanguageCodes() { throw new AssertionError();}
+        public final static String LANGUAGE_CODE_ENGLISH_US = "en-us";
+        public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk";
+    }
+
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementException.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementException.java
index 48c409b8945..4d261973e7d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementException.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementException.java
@@ -15,7 +15,6 @@
  */
 package org.wso2.carbon.device.mgt.common;
 
-@SuppressWarnings("unused")
 public class DeviceManagementException extends Exception {
 
     private static final long serialVersionUID = -3151279311929070297L;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
index 311e59d9616..96a591ef755 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
@@ -50,7 +50,6 @@ import org.wso2.carbon.user.core.service.RealmService;
  * bind="setDeviceManagerService"
  * unbind="unsetDeviceManagerService"
  */
-@SuppressWarnings("unused")
 public class DeviceManagementServiceComponent {
 
     private static Log log = LogFactory.getLog(DeviceManagementServiceComponent.class);