diff --git a/tools/test/bin/onos b/tools/test/bin/onos
index 222ab99..44ba393 100755
--- a/tools/test/bin/onos
+++ b/tools/test/bin/onos
@@ -10,7 +10,7 @@
 
 flags:
 - -w : Waits for ONOS instance to reach run-level 100, i.e. to be fully started.
-- -f : (Affects non-secure client only) - use bash's IFS expansion of positional parameters
+- -f : Deprecated - use bash's IFS expansion of positional parameters
 
 options:
 - [node] : the node to attach to
@@ -30,19 +30,8 @@
 . $ONOS_ROOT/tools/test/bin/find-node.sh
 
 [ "$1" = "-w" ] && shift && onos-wait-for-start $1
-[ "$1" = "-f" ] && shift && flat=1
+[ "$1" = "-f" ] && shift   # Deprecated
 
 [ -n "$1" ] && OCI=$(find_node $1) && shift
 
-if which client 1>/dev/null 2>&1 && [ -z "$ONOS_USE_SSH" ]; then
-    # Use Karaf client only if we can and are allowed to
-    unset KARAF_HOME
-    if [ -z "$flat" ]; then
-        client -h $OCI -u karaf "$@" 2>/dev/null
-    else
-        client -h $OCI -u karaf "$*" 2>/dev/null
-    fi
-else
-    # Otherwise use raw ssh; strict checking is off for dev environments only
-    ssh -p 8101 -o StrictHostKeyChecking=no $OCI "$@"
-fi
+ssh -p 8101 -o StrictHostKeyChecking=no $OCI "$@"