diff --git a/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LanguagesFileParser.java b/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LanguagesFileParser.java
index 7700dc841..f1f075275 100644
--- a/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LanguagesFileParser.java
+++ b/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LanguagesFileParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 VMware, Inc.
+ * Copyright 2019-2023 VMware, Inc.
  * SPDX-License-Identifier: EPL-2.0
  */
 package com.vmware.i18n.l2.service.locale;
diff --git a/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LocaleService.java b/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LocaleService.java
index ae5ddc085..c5b2bda7c 100644
--- a/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LocaleService.java
+++ b/g11n-ws/modules/md-service-i18n-l2/src/main/java/com/vmware/i18n/l2/service/locale/LocaleService.java
@@ -5,7 +5,6 @@
 package com.vmware.i18n.l2.service.locale;
 
 import com.ibm.icu.impl.LocaleUtility;
-import com.vmware.i18n.cldr.CLDR;
 import com.vmware.i18n.utils.CommonUtil;
 import com.vmware.vip.common.cache.CacheName;
 import com.vmware.vip.common.cache.TranslationCache3;
diff --git a/g11n-ws/vip-common/src/main/java/com/vmware/vip/common/utils/LocaleUtils.java b/g11n-ws/vip-common/src/main/java/com/vmware/vip/common/utils/LocaleUtils.java
index 94a50897c..ec3870465 100644
--- a/g11n-ws/vip-common/src/main/java/com/vmware/vip/common/utils/LocaleUtils.java
+++ b/g11n-ws/vip-common/src/main/java/com/vmware/vip/common/utils/LocaleUtils.java
@@ -104,11 +104,11 @@ public static String normalizeToLanguageTag(String localeStr) {
         if(null ==localeStr || "".equalsIgnoreCase(localeStr)){
             return localeStr;
         }
-		localeStr = localeStr.replace("_", "-");
-		if(localeStr.indexOf(ConstantsUnicode.ALT)>0)//handle languages like en-US-alt-short
-			localeStr = localeStr.substring(0, localeStr.indexOf(ConstantsUnicode.ALT));
-        if (isLanguageTag(localeStr)) {
-            return Locale.forLanguageTag(localeStr).toLanguageTag();
+		String localeTag = localeStr.replace("_", "-");
+		if(localeTag.indexOf(ConstantsUnicode.ALT)>0)//handle languages like en-US-alt-short
+			localeTag = localeTag.substring(0, localeTag.indexOf(ConstantsUnicode.ALT));
+        if (isLanguageTag(localeTag)) {
+            return Locale.forLanguageTag(localeTag).toLanguageTag();
         } else {
             String language = "", country = "", script = "";
             String[] os = localeStr.split("-");
diff --git a/g11n-ws/vip-manager-i18n/src/main/resources/ehcache3.xml b/g11n-ws/vip-manager-i18n/src/main/resources/ehcache3.xml
index ec12b1b27..697764f1c 100644
--- a/g11n-ws/vip-manager-i18n/src/main/resources/ehcache3.xml
+++ b/g11n-ws/vip-manager-i18n/src/main/resources/ehcache3.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2019-2022 VMware, Inc.
+Copyright 2019-2023 VMware, Inc.
 SPDX-License-Identifier: EPL-2.0
 -->
 <config xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'