diff --git a/mcstatus b/mcstatus
index 02bf395b..89c62d78 100755
--- a/mcstatus
+++ b/mcstatus
@@ -1,19 +1,16 @@
 #!/bin/bash
 
 ##### mcstatus shim for mc-monitor
+# handles translating calls to
+#   mcstatus (host:port) (command)
+# where the actual command is ignore, but is typically ping or status
 
 addr="$1"
-cmd="$2"
 
-if [[ ${cmd} == "ping" ]]; then
-  IFS=':'
-  read -a parts <<< "${addr}"
-  if [[ ${#parts[*]} -gt 1 ]]; then
-    exec mc-monitor status --host ${parts[0]} --port ${parts[1]}
-  else
-    exec mc-monitor status --host ${parts[0]}
-  fi
+IFS=':'
+read -a parts <<< "${addr}"
+if [[ ${#parts[*]} -gt 1 ]]; then
+  exec mc-monitor status --host ${parts[0]} --port ${parts[1]}
 else
-  echo "ERROR can only shim the 'ping' command"
-  exit 1
-fi
\ No newline at end of file
+  exec mc-monitor status --host ${parts[0]}
+fi