diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 27ce54c92..2e40e8844 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -298,12 +298,7 @@ JS
 			);
 		}
 		$sHTMLValue .= "</div>";
-
-		// Note: This test is no longer necessary as we changed the markup to extract validation decoration in the standard .field_input_xxx container
-		//if (($sDisplayStyle == 'select') || ($sDisplayStyle == 'list'))
-		//{
 		$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
-		//}
 
 		return $sHTMLValue;
 	}
@@ -324,7 +319,6 @@ JS
 		$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
 
 		$sHTMLValue = "<div class=\"field_input_zone field_input_extkey\">";
-		$sFilter = addslashes($oAllowedValues->GetFilter()->ToOQL());
 
 		if (is_null($oAllowedValues))
 		{
@@ -612,12 +606,7 @@ JS
 );
 		}
         $sHTMLValue .= "</div>";
-
-		// Note: This test is no longer necessary as we changed the markup to extract validation decoration in the standard .field_input_xxx container
-		//if (($sDisplayStyle == 'select') || ($sDisplayStyle == 'list'))
-		//{
-			$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
-		//}
+		$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
 
 		return $sHTMLValue;
 	}
diff --git a/js/extkeywidget.js b/js/extkeywidget.js
index 34e951e80..316f1f04c 100644
--- a/js/extkeywidget.js
+++ b/js/extkeywidget.js
@@ -45,7 +45,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 					item: function(item) {
 						if ( item.obsolescence_flag == 1)
 						{
-							console.warn("ici");
 							val = '<span class="object-ref-icon fas fa-eye-slash object-obsolete fa-1x fa-fw"></span>'+item.label;
 						}
 						else
@@ -56,9 +55,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 							.append(val);
 					},
 					option: function(item) {
-						console.warn(item);
-						console.warn(item.obsolescence_flag);
-						console.warn($.inArray(item, 'obsolescence_flag'));
 						if ( item.obsolescence_flag == 1)
 						{
 							console.warn("ici");