diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info
index 675ad7d..3b2d97a 100755
--- a/overlay/opt/emcomm-tools/bin/et-system-info
+++ b/overlay/opt/emcomm-tools/bin/et-system-info
@@ -22,13 +22,18 @@ fi
 case $1 in
   active-radio)
     if [ -L  "${ET_HOME}/conf/radios.d/active-radio.json" ]; then
-      cat /opt/emcomm-tools/conf/radios.d/active-radio.json | jq -r .model
+      cat "${ET_HOME}/conf/radios.d/active-radio.json" | jq -r .model
     else
-      echo "None"
+      echo "No radio selected"
     fi 
     ;;
   et-cat)
 
+    if [ ! -L "${ET_HOME}/conf/radios.d/active-radio.json" ]; then
+      echo "N/A"
+      exit 0
+    fi
+
     # 1. Check if the symlink was created by the udev rules
     if [ -e /dev/et-cat ]; then 
 
@@ -44,7 +49,7 @@ case $1 in
           echo "Connected. Can't access VFO"; 
         fi
       else
-        echo "rigctld not running"
+        echo "Connected. rigctld not running"
       fi
     else
       echo "Not connected"; 
diff --git a/overlay/opt/emcomm-tools/sbin/wrapper-rigtctld.sh b/overlay/opt/emcomm-tools/sbin/wrapper-rigtctld.sh
index 150b6f0..cbb6953 100755
--- a/overlay/opt/emcomm-tools/sbin/wrapper-rigtctld.sh
+++ b/overlay/opt/emcomm-tools/sbin/wrapper-rigtctld.sh
@@ -32,14 +32,6 @@ start() {
     exit 1
   fi
 
-  # Attempt "full auto" plug-and-play for select devices
-  udevadm info ${CAT_DEVICE} | grep ET_DEVICE > /dev/null
-  if [ $? -eq 0 ]; then
-    et-log "Attempting full auto plug and play..." 
-    ET_DEVICE=$(udevadm info ${CAT_DEVICE} | grep ET_DEVICE | cut -d"=" -f2)
-    do_full_auto $ET_DEVICE
-  fi
-
   if [ ! -L ${ACTIVE_RADIO} ]; then
     et-log "No active radio defined. ${ACTIVE_RADIO} symlink is missing."
     exit 1