diff --git a/src/etc/inc/openvpn_wizard.inc b/src/etc/inc/openvpn_wizard.inc
index 75f642184..7409ae3db 100644
--- a/src/etc/inc/openvpn_wizard.inc
+++ b/src/etc/inc/openvpn_wizard.inc
@@ -28,7 +28,6 @@
 
 require_once("openvpn.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 
 function cert_get_subject_hash($crt)
 {
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
deleted file mode 100644
index c7e7d2f2a..000000000
--- a/src/etc/inc/pfsense-utils.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
-    Copyright (C) 2004-2007 Scott Ullrich <sullrich@gmail.com>
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-*/
diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc
index 7605ec594..a0b6a7d6a 100644
--- a/src/etc/inc/xmlrpc/legacy.inc
+++ b/src/etc/inc/xmlrpc/legacy.inc
@@ -130,7 +130,6 @@ function filter_configure_xmlrpc()
     require_once("openvpn.inc");
     require_once("services.inc");
     require_once("rrd.inc");
-    require_once('pfsense-utils.inc');
 
     filter_configure();
     system_routing_configure();
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 42a0229bb..b767e2508 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -125,7 +125,6 @@ require_once("interfaces.inc");
 echo ".";
 require_once("services.inc");
 echo ".";
-require_once("pfsense-utils.inc");
 echo ".";
 require_once("system.inc");
 echo ".";
diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup
index 7a6ad3dea..c77ef4340 100755
--- a/src/etc/rc.carpbackup
+++ b/src/etc/rc.carpbackup
@@ -31,7 +31,6 @@ require_once("config.inc");
 require_once("openvpn.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 
 $argument = str_replace("\n", "", $argv[1]);
 if (!strstr($argument, "@"))
diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster
index ef83444c6..4988ac0f4 100755
--- a/src/etc/rc.carpmaster
+++ b/src/etc/rc.carpmaster
@@ -31,7 +31,6 @@ require_once("config.inc");
 require_once("openvpn.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 
 $argument = str_replace("\n", "", $argv[1]);
 if (!strstr($argument, "@"))
diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update
index aec90baac..a09889f07 100755
--- a/src/etc/rc.dyndns.update
+++ b/src/etc/rc.dyndns.update
@@ -32,7 +32,6 @@ require_once("interfaces.inc");
 require_once("util.inc");
 require_once("filter.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 
 /* Interface IP address has changed */
 
diff --git a/src/etc/rc.filter_configure_sync b/src/etc/rc.filter_configure_sync
index 63a2670dd..38669f902 100755
--- a/src/etc/rc.filter_configure_sync
+++ b/src/etc/rc.filter_configure_sync
@@ -32,7 +32,6 @@ require_once("util.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("plugins.inc");
diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc
index a5de203a5..fbd51d44a 100755
--- a/src/etc/rc.filter_configure_xmlrpc
+++ b/src/etc/rc.filter_configure_xmlrpc
@@ -40,7 +40,6 @@ require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("vslb.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("rrd.inc");
 
diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip
index b2387604d..5eedaf463 100755
--- a/src/etc/rc.initial.setlanip
+++ b/src/etc/rc.initial.setlanip
@@ -36,7 +36,6 @@ require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("unbound.inc");
 require_once("system.inc");
diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports
index ab4485714..5b3e99e12 100755
--- a/src/etc/rc.initial.setports
+++ b/src/etc/rc.initial.setports
@@ -38,7 +38,6 @@ require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("pfsense-utils.inc");
 require_once("unbound.inc");
 
 if (set_networking_interfaces_ports()) {
diff --git a/src/etc/rc.interfaces_wan_configure b/src/etc/rc.interfaces_wan_configure
index 215fbfdae..7f1d15f6c 100755
--- a/src/etc/rc.interfaces_wan_configure
+++ b/src/etc/rc.interfaces_wan_configure
@@ -33,7 +33,6 @@ require_once("filter.inc");
 require_once("system.inc");
 require_once('openvpn.inc');
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 require_once("unbound.inc");
 require_once("services.inc");
 
diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup
index 88ed019ec..9c7ca07de 100755
--- a/src/etc/rc.linkup
+++ b/src/etc/rc.linkup
@@ -35,7 +35,6 @@ require_once('ipsec.inc');
 require_once('openvpn.inc');
 require_once("util.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("unbound.inc");
 require_once("services.inc");
 
diff --git a/src/etc/rc.newipsecdns b/src/etc/rc.newipsecdns
index 6a4139986..34e0062a7 100755
--- a/src/etc/rc.newipsecdns
+++ b/src/etc/rc.newipsecdns
@@ -33,7 +33,6 @@ require_once("util.inc");
 require_once("config.inc");
 require_once("filter.inc");
 require_once('ipsec.inc');
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 /* make sure to wait until the boot scripts have finished */
diff --git a/src/etc/rc.newroutedns b/src/etc/rc.newroutedns
index aed10edb7..a85ac737e 100755
--- a/src/etc/rc.newroutedns
+++ b/src/etc/rc.newroutedns
@@ -31,7 +31,6 @@
 require_once("util.inc");
 require_once("config.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("gwlb.inc");
 
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 1fc8b4269..f3e6e9ac0 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -37,7 +37,6 @@ require_once("rrd.inc");
 require_once("util.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("unbound.inc");
 require_once("plugins.inc");
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 68f0502fd..6776fe4c6 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -39,7 +39,6 @@ require_once("rrd.inc");
 require_once("util.inc");
 require_once("system.inc");
 require_once("plugins.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 /* Interface IP address has changed */
diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all
index 3cd9ade7e..a0a9898d9 100755
--- a/src/etc/rc.reload_all
+++ b/src/etc/rc.reload_all
@@ -34,7 +34,6 @@ require_once("filter.inc");
 require_once('ipsec.inc');
 require_once("util.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("unbound.inc");
 require_once("interfaces.inc");
diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces
index 42f1a95e0..97895a248 100755
--- a/src/etc/rc.reload_interfaces
+++ b/src/etc/rc.reload_interfaces
@@ -34,7 +34,6 @@ require_once("openvpn.inc");
 require_once('ipsec.inc');
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("unbound.inc");
 
diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate
index 8481c7bbe..fa0ef94d6 100755
--- a/src/etc/rc.resolv_conf_generate
+++ b/src/etc/rc.resolv_conf_generate
@@ -31,7 +31,6 @@ require_once("util.inc");
 require_once("config.inc");
 require_once("system.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 system_resolvconf_generate(true);
diff --git a/src/etc/rc.update_alias_url_data b/src/etc/rc.update_alias_url_data
index c01f0f40e..3c6685b18 100755
--- a/src/etc/rc.update_alias_url_data
+++ b/src/etc/rc.update_alias_url_data
@@ -28,7 +28,6 @@
 
 require_once("config.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 
 
 function update_alias_url_data()
diff --git a/src/etc/rc.update_urltables b/src/etc/rc.update_urltables
index fafb974a3..4327f18e2 100755
--- a/src/etc/rc.update_urltables
+++ b/src/etc/rc.update_urltables
@@ -4,7 +4,6 @@
 require_once("config.inc");
 require_once("util.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 
 if (!isset($config['aliases']['alias'])) {
     // No aliases
diff --git a/src/sbin/3gstats.php b/src/sbin/3gstats.php
index 82effd472..cff97d168 100755
--- a/src/sbin/3gstats.php
+++ b/src/sbin/3gstats.php
@@ -1,6 +1,5 @@
 #!/usr/local/bin/php
 <?php
-require_once("pfsense-utils.inc");
 
 ini_set("max_execution_time", "0");
 
diff --git a/src/www/carp_status.php b/src/www/carp_status.php
index 98764ac2a..0fffea09d 100644
--- a/src/www/carp_status.php
+++ b/src/www/carp_status.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 function interfaces_carp_set_maintenancemode($carp_maintenancemode)
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php
index dd560cf16..32b0a8c23 100644
--- a/src/www/diag_backup.php
+++ b/src/www/diag_backup.php
@@ -38,7 +38,6 @@ require_once("filter.inc");
 require_once("services.inc");
 require_once("rrd.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 
 /**
  * restore config section
diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php
index 58f52d96d..1ceaec248 100644
--- a/src/www/diag_logs_filter.php
+++ b/src/www/diag_logs_filter.php
@@ -34,7 +34,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("filter_log.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc");
 
diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php
index 09d807c31..f30afcf06 100644
--- a/src/www/diag_logs_settings.php
+++ b/src/www/diag_logs_settings.php
@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 require_once("plugins.inc");
diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php
index 1b8e4f528..beb39e33a 100644
--- a/src/www/diag_packet_capture.php
+++ b/src/www/diag_packet_capture.php
@@ -26,7 +26,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 /**
diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php
index cc43f5eef..6f1806607 100644
--- a/src/www/firewall_aliases_edit.php
+++ b/src/www/firewall_aliases_edit.php
@@ -32,7 +32,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 
 /**
  * generate simple country selection list for geoip
diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php
index a546c2f32..a611aaa2a 100644
--- a/src/www/firewall_nat_1to1_edit.php
+++ b/src/www/firewall_nat_1to1_edit.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 
 
 if (!isset($config['nat']['onetoone'])) {
diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index 5d10265eb..6dbedb39d 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("filter.inc");
 
 
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index 8aea2ade7..05fd0c38d 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 
 
 if (!isset($config['nat']['npt'])) {
diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php
index 8db805924..9548f23b4 100644
--- a/src/www/firewall_nat_out.php
+++ b/src/www/firewall_nat_out.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index 8d4a102cc..d841d7ff3 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("filter.inc");
 
 /**
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index 89eb35083..fed81a66c 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 
 
 if (!isset($config['filter']['rule'])) {
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index d06cf7e44..2f08bcf2e 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("filter.inc");
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index aa308eb9f..59e87a162 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -31,7 +31,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 
 /**
  * find max vhid
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index 937314c15..54bec64c8 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -39,7 +39,6 @@ require_once("interfaces.inc");
 require_once("ipsec.inc");
 require_once("openvpn.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 require_once("unbound.inc");
 
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 2a00da6bc..3cf8c3d97 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -35,7 +35,6 @@ require_once("system.inc");
 require_once("interfaces.inc");
 require_once("ipsec.inc");
 require_once("openvpn.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 require_once("unbound.inc");
diff --git a/src/www/interfaces_bridge_edit.php b/src/www/interfaces_bridge_edit.php
index 8703e86f9..cbf824886 100644
--- a/src/www/interfaces_bridge_edit.php
+++ b/src/www/interfaces_bridge_edit.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("unbound.inc");
 require_once("services.inc");
diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php
index 5817bcd17..cfc0628f5 100644
--- a/src/www/interfaces_gif_edit.php
+++ b/src/www/interfaces_gif_edit.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
 require_once("unbound.inc");
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index b6a13f30b..c80d0eb7e 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("unbound.inc");
 require_once("services.inc");
diff --git a/src/www/interfaces_lagg_edit.php b/src/www/interfaces_lagg_edit.php
index 4499a23e3..262b0284b 100644
--- a/src/www/interfaces_lagg_edit.php
+++ b/src/www/interfaces_lagg_edit.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
 require_once("unbound.inc");
diff --git a/src/www/interfaces_vlan_edit.php b/src/www/interfaces_vlan_edit.php
index bfc617cd5..f09b05f6b 100644
--- a/src/www/interfaces_vlan_edit.php
+++ b/src/www/interfaces_vlan_edit.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("unbound.inc");
 require_once("services.inc");
diff --git a/src/www/reporting_settings.php b/src/www/reporting_settings.php
index 8506e19d8..5adb4a709 100644
--- a/src/www/reporting_settings.php
+++ b/src/www/reporting_settings.php
@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("services.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 8d341f11e..57d6aa7a7 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -32,7 +32,6 @@ require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
 require_once("unbound.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 
diff --git a/src/www/services_dhcp_relay.php b/src/www/services_dhcp_relay.php
index 96a6f314f..b5c364114 100644
--- a/src/www/services_dhcp_relay.php
+++ b/src/www/services_dhcp_relay.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index b11bb35f9..d78b15344 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index 17a5744c9..5b337e094 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -32,7 +32,6 @@ require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("unbound.inc");
 
diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php
index 8bb3ef8f0..b73a21d8d 100644
--- a/src/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/www/services_dnsmasq_domainoverride_edit.php
@@ -32,7 +32,6 @@ require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
-require_once("pfsense-utils.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 
diff --git a/src/www/services_dyndns.php b/src/www/services_dyndns.php
index f85b85bdb..7e5debfcc 100644
--- a/src/www/services_dyndns.php
+++ b/src/www/services_dyndns.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 
 if (empty($config['dyndnses']['dyndns']) || !isset($config['dyndnses']['dyndns'])) {
     $config['dyndnses']['dyndns'] = array();
diff --git a/src/www/services_dyndns_edit.php b/src/www/services_dyndns_edit.php
index 01cd8b875..1cbfcc37f 100644
--- a/src/www/services_dyndns_edit.php
+++ b/src/www/services_dyndns_edit.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc") ;
 require_once("interfaces.inc");
diff --git a/src/www/services_opendns.php b/src/www/services_opendns.php
index 725a7b037..bb6a3c402 100644
--- a/src/www/services_opendns.php
+++ b/src/www/services_opendns.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
diff --git a/src/www/services_rfc2136.php b/src/www/services_rfc2136.php
index 4c236b41c..c04fd4672 100644
--- a/src/www/services_rfc2136.php
+++ b/src/www/services_rfc2136.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 
 if (!isset($config['dnsupdates']['dnsupdate'])) {
     $config['dnsupdates']['dnsupdate'] = array();
diff --git a/src/www/services_rfc2136_edit.php b/src/www/services_rfc2136_edit.php
index ae500a70d..1c88e52f5 100644
--- a/src/www/services_rfc2136_edit.php
+++ b/src/www/services_rfc2136_edit.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 
 if (!isset($config['dnsupdates']['dnsupdate'])) {
     $config['dnsupdates']['dnsupdate'] = array();
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index 951031aaf..0a41827fa 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 
diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php
index 19215a5a0..a9fd7d006 100644
--- a/src/www/services_unbound_acls.php
+++ b/src/www/services_unbound_acls.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php
index b7d61432c..f2d964b0d 100644
--- a/src/www/services_unbound_advanced.php
+++ b/src/www/services_unbound_advanced.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_unbound_overrides.php b/src/www/services_unbound_overrides.php
index cb9a47650..1c502bb9c 100644
--- a/src/www/services_unbound_overrides.php
+++ b/src/www/services_unbound_overrides.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 
diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php
index 3114edafc..1a5b985dd 100644
--- a/src/www/status_dhcp_leases.php
+++ b/src/www/status_dhcp_leases.php
@@ -31,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("config.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
 
diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php
index 3d62fede9..6dc6acbdd 100644
--- a/src/www/status_dhcpv6_leases.php
+++ b/src/www/status_dhcpv6_leases.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php
index f68de9705..d50503620 100644
--- a/src/www/status_interfaces.php
+++ b/src/www/status_interfaces.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
 require_once("unbound.inc");
diff --git a/src/www/status_services.php b/src/www/status_services.php
index cdb67c758..d5a6bae1d 100644
--- a/src/www/status_services.php
+++ b/src/www/status_services.php
@@ -34,7 +34,6 @@ require_once('plugins.inc');
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("unbound.inc");
-require_once("pfsense-utils.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index 4f0744e67..f83911f47 100644
--- a/src/www/system_advanced_admin.php
+++ b/src/www/system_advanced_admin.php
@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 
diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php
index 2df6f87db..39263f2e5 100644
--- a/src/www/system_advanced_misc.php
+++ b/src/www/system_advanced_misc.php
@@ -34,7 +34,6 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vslb.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
diff --git a/src/www/system_advanced_network.php b/src/www/system_advanced_network.php
index 552b3288a..890e82cb0 100644
--- a/src/www/system_advanced_network.php
+++ b/src/www/system_advanced_network.php
@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = array();
diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php
index c368c29ce..1914f34e9 100644
--- a/src/www/system_gateway_groups.php
+++ b/src/www/system_gateway_groups.php
@@ -32,7 +32,6 @@ require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("system.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("rrd.inc");
 
 // Resync and restart all VPNs using a gateway group.
diff --git a/src/www/system_gateways.php b/src/www/system_gateways.php
index 034ba8a2a..0a406b48a 100644
--- a/src/www/system_gateways.php
+++ b/src/www/system_gateways.php
@@ -32,7 +32,6 @@ require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("rrd.inc");
 
 /**
diff --git a/src/www/system_general.php b/src/www/system_general.php
index 28d0d5c0e..b9e0b0fd8 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
diff --git a/src/www/system_routes.php b/src/www/system_routes.php
index 802208923..d171b9586 100644
--- a/src/www/system_routes.php
+++ b/src/www/system_routes.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("rrd.inc");
 
 function delete_static_route($id)
diff --git a/src/www/system_routes_edit.php b/src/www/system_routes_edit.php
index edba90487..41aaa1ec1 100644
--- a/src/www/system_routes_edit.php
+++ b/src/www/system_routes_edit.php
@@ -31,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
-require_once("pfsense-utils.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_routes.php');
 
diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php
index f38f30579..4f495b4fa 100644
--- a/src/www/vpn_ipsec.php
+++ b/src/www/vpn_ipsec.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc");
 
diff --git a/src/www/vpn_ipsec_keys.php b/src/www/vpn_ipsec_keys.php
index b452f08b3..ae8c95c3c 100644
--- a/src/www/vpn_ipsec_keys.php
+++ b/src/www/vpn_ipsec_keys.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("filter.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc");
 
diff --git a/src/www/vpn_ipsec_mobile.php b/src/www/vpn_ipsec_mobile.php
index 11f6c73a0..b3dc9aff2 100644
--- a/src/www/vpn_ipsec_mobile.php
+++ b/src/www/vpn_ipsec_mobile.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("plugins.inc");
 
 if (!isset($config['ipsec']) || !is_array($config['ipsec'])) {
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index cc52dee71..01a32ea0b 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc");
 
diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php
index b0083eee8..bc2c4ef7a 100644
--- a/src/www/vpn_ipsec_settings.php
+++ b/src/www/vpn_ipsec_settings.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc");
 
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index e8ba4acc2..6de37ae04 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once('pfsense-utils.inc');
 
 if (!isset($config['openvpn']['openvpn-client'])) {
     $config['openvpn']['openvpn-client'] = array();
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index 5afb400d4..d8b371be7 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once('pfsense-utils.inc');
 
 // define all fields used in this form
 $all_form_fields = "custom_options,disable,common_name,block,description
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index b426e5d8a..9afcc4d1f 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
 require_once("openvpn-client-export.inc");
diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php
index d5631e73f..c60260da8 100644
--- a/src/www/vpn_openvpn_export_shared.php
+++ b/src/www/vpn_openvpn_export_shared.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("openvpn-client-export.inc");
 
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index fb447c34e..ea00b09a7 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
-require_once('pfsense-utils.inc');
 
 if (!isset($config['openvpn']['openvpn-server'])) {
     $config['openvpn']['openvpn-server'] = array();
diff --git a/src/www/widgets/api/get.php b/src/www/widgets/api/get.php
index 8e87ee04f..19be68cff 100644
--- a/src/www/widgets/api/get.php
+++ b/src/www/widgets/api/get.php
@@ -42,7 +42,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("config.inc");
 require_once("filter.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 // parse request, load parameter contains all plugins that should be loaded for this request
diff --git a/src/www/widgets/widgets/carp_status.widget.php b/src/www/widgets/widgets/carp_status.widget.php
index 8b356c553..5c1007fc1 100644
--- a/src/www/widgets/widgets/carp_status.widget.php
+++ b/src/www/widgets/widgets/carp_status.widget.php
@@ -29,7 +29,6 @@
 
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 if (!isset($config['virtualip']['vip'])) {
diff --git a/src/www/widgets/widgets/dyn_dns_status.widget.php b/src/www/widgets/widgets/dyn_dns_status.widget.php
index b6b033677..574689f88 100644
--- a/src/www/widgets/widgets/dyn_dns_status.widget.php
+++ b/src/www/widgets/widgets/dyn_dns_status.widget.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("widgets/include/dyn_dns_status.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
diff --git a/src/www/widgets/widgets/interface_list.widget.php b/src/www/widgets/widgets/interface_list.widget.php
index 71dd96802..fcf24a20a 100644
--- a/src/www/widgets/widgets/interface_list.widget.php
+++ b/src/www/widgets/widgets/interface_list.widget.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("widgets/include/interfaces.inc");
 require_once("interfaces.inc");
 
diff --git a/src/www/widgets/widgets/load_balancer_status.widget.php b/src/www/widgets/widgets/load_balancer_status.widget.php
index 8fe7c3a3b..aafd73273 100644
--- a/src/www/widgets/widgets/load_balancer_status.widget.php
+++ b/src/www/widgets/widgets/load_balancer_status.widget.php
@@ -32,7 +32,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("filter.inc");
 require_once("vslb.inc");
 
diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php
index 73e18d4ae..9e1a80ddb 100644
--- a/src/www/widgets/widgets/log.widget.php
+++ b/src/www/widgets/widgets/log.widget.php
@@ -31,7 +31,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 require_once("filter_log.inc");
 
diff --git a/src/www/widgets/widgets/ntp_status.widget.php b/src/www/widgets/widgets/ntp_status.widget.php
index 6305d9918..6ee851002 100644
--- a/src/www/widgets/widgets/ntp_status.widget.php
+++ b/src/www/widgets/widgets/ntp_status.widget.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("widgets/include/ntp_status.inc");
 
 if ($_REQUEST['updateme']) {
diff --git a/src/www/widgets/widgets/picture.widget.php b/src/www/widgets/widgets/picture.widget.php
index 6b44ec042..8d5875006 100644
--- a/src/www/widgets/widgets/picture.widget.php
+++ b/src/www/widgets/widgets/picture.widget.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 
 if ($_GET['getpic']=="true") {
     $pic_type_s = explode(".", $config['widgets']['picturewidget_filename']);
diff --git a/src/www/widgets/widgets/rss.widget.php b/src/www/widgets/widgets/rss.widget.php
index 4ffd51482..03cfbb272 100644
--- a/src/www/widgets/widgets/rss.widget.php
+++ b/src/www/widgets/widgets/rss.widget.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("simplepie/autoloader.php");
 require_once("simplepie/idn/idna_convert.class.php");
 
diff --git a/src/www/widgets/widgets/system_information.widget.php b/src/www/widgets/widgets/system_information.widget.php
index d966323b8..ebe137030 100644
--- a/src/www/widgets/widgets/system_information.widget.php
+++ b/src/www/widgets/widgets/system_information.widget.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 require_once("system.inc");
 
 
diff --git a/src/www/widgets/widgets/system_log.widget.php b/src/www/widgets/widgets/system_log.widget.php
index cb867a74a..bcb722467 100644
--- a/src/www/widgets/widgets/system_log.widget.php
+++ b/src/www/widgets/widgets/system_log.widget.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("pfsense-utils.inc");
 
 $system_logfile = '/var/log/system.log';
 
diff --git a/src/www/wizard.php b/src/www/wizard.php
index 6439da135..4b1d3bf18 100644
--- a/src/www/wizard.php
+++ b/src/www/wizard.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("system.inc");
-require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
 /*