diff --git a/ui/scripts/ui-custom/ipRules.js b/ui/scripts/ui-custom/ipRules.js
index bb8c000308e..68d95dce908 100644
--- a/ui/scripts/ui-custom/ipRules.js
+++ b/ui/scripts/ui-custom/ipRules.js
@@ -42,7 +42,7 @@
         return true;
       };
 
-      var staticNATChart = function(args, includingFirewall) {
+      var staticNATChart = function(args) {
         var $chart = $('#template').find('.network-chart.static-nat').clone();
         var $vmName = $chart.find('li.static-nat-enabled .vmname');
         var $browser = $('#browser .container');
@@ -91,15 +91,10 @@
             }
           }
         });
-			
-				if(includingFirewall == true) {
-				  $chart.find('li.firewall .view-details').click(function() {
-						makeMultiEditPanel($(this), { title: _l('label.nat.port.range')});
-					});				
-				}
-				else {				
-					$chart.find('li.firewall').hide(); 
-				}
+							
+				$chart.find('li.firewall .view-details').click(function() {
+					makeMultiEditPanel($(this), { title: _l('label.nat.port.range')});
+				});					
 
         return $chart;
       };
@@ -114,13 +109,8 @@
 
         // 1. choose between staticNAT chart and non-staticNAT chart  2. filter disabled tabs  
         if (preFilter.length) {				 
-					if($.inArray('nonStaticNATChart', preFilter) != -1) { //choose static NAT chart
-					  if($.inArray('firewall', preFilter) == -1) {           
-						  return staticNATChart(args, true); //static NAT including Firewall 
-						}
-						else { 
-						  return staticNATChart(args, false); //static NAT excluding Firewall 
-						}						
+					if($.inArray('nonStaticNATChart', preFilter) != -1) { //choose static NAT chart					
+					  return staticNATChart(args); 		
 					}
 					else {  //choose non-static NAT chart
             $(preFilter).each(function() {
@@ -130,25 +120,7 @@
                 return $(this).hasClass(id);
               }).addClass('disabled');
             });
-          }
-					
-					/*
-          if (preFilter.length == 3) { // 'firewall', 'portForwarding', 'loadBalancing'            
-            return staticNATChart(args, true); //static NAT including Firewall 
-          }
-          else if (preFilter.length == 4) { // 'firewall', 'portForwarding', 'loadBalancing', 'staticnatFirewall'            
-            return staticNATChart(args, false); //static NAT excluding Firewall 
-          }				
-					else {
-            $(preFilter).each(function() {
-              var id = this;
-
-              var $li = $chart.find('li').filter(function() {
-                return $(this).hasClass(id);
-              }).addClass('disabled');
-            });
-          }
-					*/
+          }		
         }
 
         $chart.find('.view-details').click(function() {