diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index d8be477e7a..e07dc40416 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-21  Ramon Novoa  <rnovoa@artica.es>
+
+	* util/tentacle_serverd: Removed unused code.
+
 2008-05-19  Ramon Novoa  <rnovoa@artica.es>
 
 	* bin/pandora_server: Added support to process multiple data
diff --git a/pandora_server/util/tentacle_serverd b/pandora_server/util/tentacle_serverd
index f2125b5b1c..5e673ce597 100755
--- a/pandora_server/util/tentacle_serverd
+++ b/pandora_server/util/tentacle_serverd
@@ -3,7 +3,7 @@
 # Tentacle server simple startup script (no pid file is written).
 # Ramon Novoa  <rnovoa@artica.es>
 # Linux Version (generic)
-# v0.1 Build 010407
+# v0.1 Build 210508
 
 # chkconfig: 2345 55 25
 # description: Tentacle server
@@ -50,8 +50,6 @@ case "$1" in
 		if [ ! -z "$TENTACLE_PID" ]; then
 			echo "Tentacle server is already running with PID $TENTACLE_PID."
 			exit 1
-		else
-			rm -f $TENTACLE_PID_FILE
 		fi
 	
 		sudo -u $TENTACLE_USER ${TENTACLE_PATH}$TENTACLE_DAEMON $TENTACLE_OPTS