diff --git a/system/init.d/kazoo-bigcouch.redhat b/system/init.d/kazoo-bigcouch.redhat
index 72416a9..9188606 100755
--- a/system/init.d/kazoo-bigcouch.redhat
+++ b/system/init.d/kazoo-bigcouch.redhat
@@ -9,7 +9,6 @@
 #
 
 RETVAL=0
-PID_FILE=${PID_FILE:-/var/run/bigcouch/kazoo-bigcouch.pid}
 LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-bigcouch}
 
 . /etc/init.d/functions
@@ -17,7 +16,7 @@ LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-bigcouch}
 start() {
 	echo -n $"Starting BigCouch: "
 	/usr/sbin/kazoo-bigcouch prepare >/dev/null 2>&1
-	daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-bigcouch background >/dev/null 2>&1"
+	daemon "/usr/sbin/kazoo-bigcouch background >/dev/null 2>&1"
 	RETVAL=$?
 	if [ ${RETVAL} -eq 0 ]; then
 		touch ${LOCK_FILE}
diff --git a/system/init.d/kazoo-freeswitch.redhat b/system/init.d/kazoo-freeswitch.redhat
index 4070010..0cd17e6 100755
--- a/system/init.d/kazoo-freeswitch.redhat
+++ b/system/init.d/kazoo-freeswitch.redhat
@@ -12,22 +12,14 @@
 #
 
 RETVAL=0
-PID_FILE=${PID_FILE:-/var/run/freeswitch/kazoo-freeswitch.pid}
 LOCK_FILE=/var/lock/subsys/kazoo-freeswitch
 
 . /etc/init.d/functions
 
 start() {
 	echo -n "Starting FreeSWITCH: "
-	if [ -e ${LOCK_FILE} ]; then
-		if [ -e ${PID_FILE} ] && [ -e /proc/`cat ${PID_FILE}` ]; then
-			failure $"FreeSWITCH is already running.";
-			echo
-			return 1
-		fi
-	fi
         /usr/sbin/kazoo-freeswitch prepare >/dev/null 2>&1
-        daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-freeswitch background >/dev/null 2>&1"
+        daemon "/usr/sbin/kazoo-freeswitch background >/dev/null 2>&1"
 	RETVAL=$?
         if [ ${RETVAL} -eq 0 ]; then
                 touch ${LOCK_FILE}
@@ -41,11 +33,6 @@ start() {
 
 stop() {
 	echo -n "Shutting down FreeSWITCH: "
-	if [ ! -e ${LOCK_FILE} ]; then
-		failure $"Unable to stop FreeSWITCH: FreeSWITCH is not running."
-		echo
-		return 1;
-	fi
 	/usr/sbin/kazoo-freeswitch stop >/dev/null 2>&1
 	RETVAL=$?
         if [ ${RETVAL} -eq 0 ]; then
diff --git a/system/init.d/kazoo-generic.redhat b/system/init.d/kazoo-generic.redhat
index 09397eb..210af3e 100755
--- a/system/init.d/kazoo-generic.redhat
+++ b/system/init.d/kazoo-generic.redhat
@@ -9,7 +9,6 @@
 
 RETVAL=0
 SCRIPT_NAME=`basename "$0"`
-PID_FILE=${PID_FILE:-/var/run/kazoo/${SCRIPT_NAME}.pid}
 LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/${SCRIPT_NAME}}
 
 . /etc/init.d/functions
@@ -21,7 +20,7 @@ fi
 start() {
 	echo -n $"Starting ${SCRIPT_NAME}: "
 	/usr/sbin/${SCRIPT_NAME} prepare >/dev/null 2>&1
-	daemon --pidfile ${PID_FILE} "/usr/sbin/${SCRIPT_NAME} background >/dev/null 2>&1"
+	daemon "/usr/sbin/${SCRIPT_NAME} background >/dev/null 2>&1"
 	RETVAL=$?
 	if [ ${RETVAL} -eq 0 ]; then
 		touch ${LOCK_FILE}
diff --git a/system/init.d/kazoo-haproxy.redhat b/system/init.d/kazoo-haproxy.redhat
index 4e09843..596f812 100755
--- a/system/init.d/kazoo-haproxy.redhat
+++ b/system/init.d/kazoo-haproxy.redhat
@@ -11,7 +11,6 @@
 # pidfile:	   /var/run/haproxy/kazoo-haproxy.pid
 
 RETVAL=0
-PID_FILE=${PID_FILE:-/var/run/haproxy/kazoo-haproxy.pid}
 LOCK_FILE=/var/lock/subsys/kazoo-haproxy
 
 . /etc/rc.d/init.d/functions
@@ -19,7 +18,7 @@ LOCK_FILE=/var/lock/subsys/kazoo-haproxy
 start() {
 	echo -n $"Starting HAProxy: "
 	/usr/sbin/kazoo-haproxy prepare >/dev/null 2>&1
-        daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-haproxy background >/dev/null 2>&1"
+        daemon "/usr/sbin/kazoo-haproxy background >/dev/null 2>&1"
 	RETVAL=$?
         if [ ${RETVAL} -eq 0 ]; then
                 touch ${LOCK_FILE}
diff --git a/system/init.d/kazoo-kamailio.redhat b/system/init.d/kazoo-kamailio.redhat
index 5273adc..9d4b487 100755
--- a/system/init.d/kazoo-kamailio.redhat
+++ b/system/init.d/kazoo-kamailio.redhat
@@ -10,7 +10,6 @@
 #
 
 RETVAL=0
-PID_FILE=${PID_FILE:-/var/run/kamailio/kazoo-kamailio.pid}
 LOCK_FILE=/var/lock/subsys/kazoo-kamailio
 
 . /etc/rc.d/init.d/functions
@@ -18,7 +17,7 @@ LOCK_FILE=/var/lock/subsys/kazoo-kamailio
 start() {
 	echo -n $"Starting Kamailio: "
 	/usr/sbin/kazoo-kamailio prepare >/dev/null 2>&1
-	daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-kamailio background >/dev/null 2>&1"
+	daemon "/usr/sbin/kazoo-kamailio background >/dev/null 2>&1"
 	RETVAL=$?
 	if [ ${RETVAL} -eq 0 ]; then
 		touch ${LOCK_FILE}
diff --git a/system/init.d/kazoo-rabbitmq.redhat b/system/init.d/kazoo-rabbitmq.redhat
index 23735c3..6af15b0 100755
--- a/system/init.d/kazoo-rabbitmq.redhat
+++ b/system/init.d/kazoo-rabbitmq.redhat
@@ -12,7 +12,6 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 
 RETVAL=0
-PID_FILE=${PID_FILE:-/var/run/rabbitmq/kazoo-rabbitmq.pid}
 LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-rabbitmq}
 
 . /etc/init.d/functions
@@ -20,7 +19,7 @@ LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-rabbitmq}
 start() {
 	echo -n $"Starting RabbitMQ: "
 	/usr/sbin/kazoo-rabbitmq prepare >/dev/null 2>&1
-	daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-rabbitmq background >/dev/null 2>&1"
+	daemon "/usr/sbin/kazoo-rabbitmq background >/dev/null 2>&1"
 	RETVAL=$?
 	if [ ${RETVAL} -eq 0 ]; then
 		touch ${LOCK_FILE}
diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch
index 496d418..c455f51 100755
--- a/system/sbin/kazoo-freeswitch
+++ b/system/sbin/kazoo-freeswitch
@@ -61,7 +61,7 @@ start() {
 stop() {
 	cd ${HOME}
 	${BIN_FILE} -stop > /dev/null 2>&1
-	killproc freeswitch
+	killall freeswitch
 	RETVAL=$?
 }