diff --git a/bin/startagent b/bin/startagent
index 2469391..27dc39c 100755
--- a/bin/startagent
+++ b/bin/startagent
@@ -163,7 +163,6 @@ agent-start-or-restart () {
     [ $DISPLAY ] && logtrace "unset DISPLAY: $DISPLAY"
     [ $DISPLAY ] && unset DISPLAY
 
-    ENTRY
     local ssh_identity
     local agentfile
     local agentsocket
@@ -248,14 +247,12 @@ $(ssh-runinagent $agentfile ssh-add -l)"
 
     [ $DISPLAY_ORIG ] && logtrace "reset DISPLAY=$DISPLAY_ORIG"
     [ $DISPLAY_ORIG ] && export DISPLAY=$DISPLAY_ORIG
-    EXIT
     return $ret
 
 }
 
 agent-load-identity-keys () {
 
-    ENTRY
     # If DISPLAY is set, ssh-add calls ssh-askpass, and if its in remote-terminal, it wont work
     # So remember and unset DISPLAY, and set it at the end again, if it was set before
     [ $DISPLAY ] && local DISPLAY_ORIG=$DISPLAY
@@ -371,7 +368,6 @@ agent-load-identity-keys () {
     [ $DISPLAY_ORIG ] && logtrace "reset DISPLAY=$DISPLAY_ORIG"
     [ $DISPLAY_ORIG ] && export DISPLAY=$DISPLAY_ORIG
 
-    EXIT
 }
 
 function check-pubkeysonly () { 
@@ -392,7 +388,6 @@ function check-pubkeysonly () {
 
 ssh-runinagent () {
 
-    ENTRY
 
     local agentfile
     local command
@@ -409,7 +404,6 @@ ssh-runinagent () {
         ret=99
     fi
 
-    EXIT
     return $ret
 
 }