diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js
index 2d375f292aa..13802bd335e 100644
--- a/ui/scripts/cloud.core.configuration.js
+++ b/ui/scripts/cloud.core.configuration.js
@@ -640,23 +640,7 @@ function showConfigurationTab() {
 				}
 			});
 			
-			applyAutoCompleteToDomainField(dialogAddVlanForZone.find("#domain")); 
-			/*
-			var domainSelect = dialogAddVlanForZone.find("#add_publicip_vlan_domain").empty();	
-			$.ajax({
-				data: "command=listDomains&response=json",
-				dataType: "json",
-				async: false,
-				success: function(json) {
-					var domains = json.listdomainsresponse.domain;						
-					if (domains != null && domains.length > 0) {
-						for (var i = 0; i < domains.length; i++) {
-							domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>"); 
-						}
-					} 
-				}
-			});
-			*/
+			applyAutoCompleteToDomainField(dialogAddVlanForZone.find("#domain")); 			
 		}
 
 		dialogAddVlanForZone
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 9c83b8c2b7f..c64bfd7c8e8 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -90,6 +90,7 @@ function applyAutoCompleteToDomainField($field) {
 	}); 
 }
 
+/*
 function applyAutoCompleteToDomainChildrenField($field, parentDomainId) {  
     $field.autocomplete({
 		source: function(request, response) {			
@@ -122,6 +123,7 @@ function applyAutoCompleteToDomainChildrenField($field, parentDomainId) {
 		}
 	}); 
 }
+*/
 
 // Role Functions
 function isAdmin() {
@@ -319,6 +321,7 @@ function submenuContentEventBinder(submenuContent, listFunction) {
     	
     	applyAutoCompleteToDomainField(submenuContent.find("#advanced_search #domain")); 
     	
+    	/*
     	var domainSelect = submenuContent.find("#advanced_search #adv_search_domain");	
 		if(domainSelect.length>0 && isAdmin()) {
 		    var domainSelect = domainSelect.empty();			
@@ -335,7 +338,7 @@ function submenuContentEventBinder(submenuContent, listFunction) {
 			    }
 		    });		    
 		} 
-			
+		*/	
     	    	
     	var vmSelect = submenuContent.find("#advanced_search").find("#adv_search_vm");	
 		if(vmSelect.length>0) {		   
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index c74a33c84b8..e84ee0bfb7d 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -209,25 +209,7 @@ function showNetworkingTab(p_domainId, p_account) {
     //watermark (end)	
     
     $("#submenu_content_network #ip_searchbutton1").bind("click", refreshIpListContainerByInputBox);
-     
-    /* 		  
-    function populateDomainDropdown() {
-        var domainSelect = $("#submenu_content_network #search_by_domain").empty();			
-	    $.ajax({
-		    data: "command=listDomains&available=true&response=json",
-		    dataType: "json",
-		    success: function(json) {			        
-			    var domains = json.listdomainsresponse.domain;			 
-			    if (domains != null && domains.length > 0) {
-			        for (var i = 0; i < domains.length; i++) {
-				        domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>"); 
-			        }
-			    }
-		    }
-	    });		    
-    }	
-    */	  
-    
+         
     $("#submenu_content_network").find("#ip_searchbutton2").bind("click", function(event){
         var $searchPanel2= $("#submenu_content_network").find("#ip_search_panel2");
         
@@ -1048,10 +1030,8 @@ function showNetworkingTab(p_domainId, p_account) {
 	    
 	    if(isAdmin()) {
 	        submenuContent.find(".select_directipbg_admin").show();
-	        submenuContent.find(".select_directipbg_user").hide();	
-	        
-	        applyAutoCompleteToDomainField($("#submenu_content_network #search_by_domain"));  
-	        //populateDomainDropdown();	    
+	        submenuContent.find(".select_directipbg_user").hide();		        
+	        applyAutoCompleteToDomainField($("#submenu_content_network #search_by_domain"));  	        
 	    } else {	        
 	        submenuContent.find(".select_directipbg_admin").hide();
 	        submenuContent.find(".select_directipbg_user").show();