diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index c10ecb96f..a58c0dbcd 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -321,10 +321,11 @@ enable_watchdog();
 /* if we are operating at 1000 then increase timeouts.
    this was never accounted for after moving to 1000 hz */
 $kern_hz = get_single_sysctl('kern.clockrate');
-$kern_hz = substr($kern_hz, strpos($kern_hz, "hz = ") + 5);
-$kern_hz = substr($kern_hz, 0, strpos($kern_hz, ","));
-if($kern_hz == "1000")
-	set_single_sysctl("net.inet.tcp.rexmit_min" , "30");
+$kern_hz = substr($kern_hz, strpos($kern_hz, 'hz = ') + 5);
+$kern_hz = substr($kern_hz, 0, strpos($kern_hz, ','));
+if ($kern_hz == '1000') {
+	set_single_sysctl('net.inet.tcp.rexmit_min' , '30');
+}
 
 /* start the igmpproxy daemon */
 services_igmpproxy_configure();
@@ -338,16 +339,13 @@ activate_powerd();
 /* Set preferred protocol */
 prefer_ipv4_or_ipv6();
 
-/* Remove the old shutdown binary if we kept it. */
-if (file_exists("/sbin/shutdown.old"))
-	@unlink("/sbin/shutdown.old");
-
-
-/* Give syslogd a kick after everything else has been initialized, otherwise it can occasionally
-   fail to route syslog messages properly on both IPv4 and IPv6 */
+/*
+ * Give syslogd a kick after everything else has been
+ * initialized, otherwise it can occasionally fail to
+ * route syslog messages properly on both IPv4 and IPv6.
+ */
 system_syslogd_start();
 
-
 /* If there are ipsec dynamic hosts try again to reload the tunnels as rc.newipsecdns does */
 if ($ipsec_dynamic_hosts) {
 	vpn_ipsec_configure();
diff --git a/src/etc/rc.halt b/src/etc/rc.halt
index bde56f6a2..9c7e7e366 100755
--- a/src/etc/rc.halt
+++ b/src/etc/rc.halt
@@ -8,9 +8,4 @@ fi
 /usr/local/etc/rc.backup_rrd
 /usr/local/etc/rc.backup_dhcpleases
 
-SHUTDOWN=/sbin/shutdown
-if [ -f /sbin/shutdown.old ]; then
-	SHUTDOWN=/sbin/shutdown.old
-fi
-
-${SHUTDOWN} -op now
+/sbin/shutdown -op now
diff --git a/src/etc/rc.initial.firmware b/src/etc/rc.initial.firmware
index fb06a4e46..bcc316c58 100755
--- a/src/etc/rc.initial.firmware
+++ b/src/etc/rc.initial.firmware
@@ -53,8 +53,6 @@ echo
 
 # if we can update base, we'll do that as well
 if opnsense-update -c; then
-	# apparently, this is for moving between amd64 <-> i386
-	cp -p /sbin/shutdown /sbin/shutdown.old
 	opnsense-update && /usr/local/etc/rc.reboot
 else
 	opnsense-update
diff --git a/src/etc/rc.reboot b/src/etc/rc.reboot
index 187cbfa7a..80f31aef7 100755
--- a/src/etc/rc.reboot
+++ b/src/etc/rc.reboot
@@ -8,9 +8,4 @@ fi
 /usr/local/etc/rc.backup_rrd
 /usr/local/etc/rc.backup_dhcpleases
 
-SHUTDOWN=/sbin/shutdown
-if [ -f /sbin/shutdown.old ]; then
-	SHUTDOWN=/sbin/shutdown.old
-fi
-
-${SHUTDOWN} -or now
+/sbin/shutdown -or now