diff --git a/utils/clusterTester/david.tar.gz b/utils/clusterTester/david.tar.gz
deleted file mode 100644
index b6ec9cfc2..000000000
Binary files a/utils/clusterTester/david.tar.gz and /dev/null differ
diff --git a/utils/clusterTester/david/columnstoreClusterTester.sh b/utils/clusterTester/david/columnstoreClusterTester.sh
deleted file mode 100755
index 40ac05197..000000000
--- a/utils/clusterTester/david/columnstoreClusterTester.sh
+++ /dev/null
@@ -1,1077 +0,0 @@
-#!/bin/bash
-
-bold=$(tput bold)
-normal=$(tput sgr0)
-
-IPADDRESSES=""
-OS=""
-PASSWORD="ssh"
-CHECK=true
-REPORTPASS=true
-LOGFILE=""
-
-OS_LIST=("centos6" "centos7" "debian8" "suse12" "ubuntu16")
-
-NODE_IPADDRESS=""
-
-checkContinue() {
-
-  if [ "$CHECK" = false ]; then
-    return 0
-  fi
-  
-  echo ""
-  read -p "Failure occurred, do you want to continue? (y,n) > " answer
-  case ${answer:0:1} in
-    y|Y )
-      return 0
-    ;;
-    * ) 
-      exit
-    ;;
-  esac
-}
-
-###
-# Print Fucntions
-###
-
-helpPrint () {
-          ################################################################################
-    echo ""
-    echo  "This is the MariaDB ColumnStore Cluster System Test tool." 
-    echo ""
-    echo  "It will run a set of test to validate the setup of the MariaDB Columnstore system." 
-    echo  "This can be run prior to the install of MariaDB ColumnStore to make sure the" 
-    echo  "servers/nodes are configured properly. It should be run as the user of the planned"
-    echo  "install. Meaning if MariaDB ColumnStore is going to be installed as root user,"
-    echo  "then run from root user. Also the assumption is that the servers/node have be"
-    echo  "setup based on the Preparing for ColumnStore Installation."
-    echo  "It should also be run on the server that is designated as Performance Module #1."
-    echo  "This is the same server where the MariaDB ColumnStore package would be installed"
-    echo  " and where the install script would be executed from, postConfigure."
-    echo ""
-    echo "Additional information on Tool is documented at:"
-    echo ""
-    echo "https://mariadb.com/kb/en/mariadb/*****/"
-    echo ""
-    echo  "Items that are checked:" 
-    echo  "	Node Ping test" 
-    echo  "	Node SSH test"
-    echo  "	ColumnStore Port test"
-    echo  "	OS version" 
-    echo  "	Locale settings" 
-    echo  "	Firewall settings"
-    echo  "     Date/time settings"
-    echo  "	Dependent packages installed"
-    echo  "     For non-root user install - test permissions on /tmp and /dev/shm"
-    echo ""
-    echo  "Usage: $0 [options]" 
-    echo "OPTIONS:"
-    echo  "   -h,--help			Help" 
-    echo  "   --ipaddr=[ipaddresses]	Remote Node IP-Addresses/Hostnames, if not provide, will only check local node"
-    echo  "                             examples: 192.168.1.1,192.168.1.2 or serverum1,serverpm2"
-    echo  "   --os=[os]			Optional: Set OS Version (centos6, centos7, debian8, suse12, ubuntu16)" 
-    echo  "   --password=[password]	Provide a user password. (Default: ssh-keys setup will be assumed)" 
-    echo  "   -c,--continue		Continue on failures"
-    echo  "   --logfile=[fileName] 	Output results to a log file"
-    echo ""
-    echo  "NOTE: Dependent package : 'nmap' and 'expect' packages need to be installed locally" 
-    echo ""
-}
-
-# Parse command line options.
-while getopts hc-: OPT; do
-    case "$OPT" in
-        h)
-            echo $USAGE
-            helpPrint
-            exit 0
-            ;;
-        c)
-            CHECK=false
-            ;;      
-        -)  LONG_OPTARG="${OPTARG#*=}"
-            ## Parsing hack for the long style of arguments.
-            case $OPTARG in
-                help )  
-                    helpPrint
-                    exit 0
-                    ;;            
-		continue )
-		    CHECK=false
-		    ;;      
-                ipaddr=?* )  
-                    IPADDRESSES="$LONG_OPTARG"
-                    ;;
-                os=?* )
-                    OS="$LONG_OPTARG"
-    		    match=false
-                    for SUPPORTED_OS in "${OS_LIST[@]}"; do
-                      if [ $SUPPORTED_OS == "$OS" ]; then
-                        match=true
-                        break;
-                      fi
-                    done
-
-                    if [ $match == "false" ] ; then
-		      echo ""
-                      echo "OS version not-supported, please re-run and provide the OS from list of support OSs "
-                      for SUPPORTED_OS in "${OS_LIST[@]}"; do
-                        echo "$SUPPORTED_OS"
-                      done
-                      echo ""
-                      exit 1
-                    fi
-
-                    ;;
-                password=?* )
-                    PASSWORD="$LONG_OPTARG"
-                    ;;
-                logfile=?* )
-                    LOGFILE="$LONG_OPTARG"
-                    exec 1<>$LOGFILE
-                    exec 2>&1
-                    ;;
-                ipaddr* )  
-                    echo "No arg for --$OPTARG option" >&2
-                    exit 1
-                    ;;
-                os* )  
-                    echo "No arg for --$OPTARG option" >&2
-                    exit 1
-                    ;;
-                password* )  
-                    echo "No arg for --$OPTARG option" >&2
-                    exit 1
-                    ;;
-                continue* )
-                    echo "No arg allowed for --$OPTARG option" >&2
-                    exit 1 
-                    ;;
-                logfile* )  
-                    echo "No arg for --$OPTARG option" >&2
-                    exit 1
-                    ;;
-                 help* )  
-                    helpPrint
-                    exit 0
-                    ;;                                        
-                 '' )
-                    break ;; # "--" terminates argument processing
-                * )
-                    echo "Illegal option --$OPTARG" >&2
-                    exit 1
-                    ;;
-            esac 
-            ;;       
-        \?)
-            # getopts issues an error message
-            echo $USAGE >&2
-            exit 1
-            ;;
-    esac
-done
-
-# Remove the switches we parsed above.
-shift `expr $OPTIND - 1`
-
-if [ "$IPADDRESSES" != "" ]; then
-  #parse IP Addresses into an array
-  IFS=','
-  read -ra NODE_IPADDRESS <<< "$IPADDRESSES"
-  
-  if ! type expect > /dev/null 2>&1 ; then
-      echo "expect is not installed. Please install and rerun."
-      exit 1
-  fi
-
-  if ! type nmap > /dev/null 2>&1; then
-      echo "nmap is not installed. Please install and rerun."
-      exit 1
-  fi
-fi  
-
-checkLocalOS()
-{
-  echo "** Validate local OS is supported"
-  echo ""
-
-  #get local OS
-  `./os_detect.sh > /tmp/os_detect 2>&1`
-  if [ "$?" -eq 0 ]; then
-    localOS=`cat /tmp/os_detect | grep "Operating System name" | cut -f2 -d '"'`
-    echo "Local Node OS System Name : $localOS"
-
-    if [ "$OS" != "" ] ; then
-      echo ""
-      echo "Local Node OS Versions doesn't match the command line OS argument"
-      echo "Contining using the Detected Local Node OS Version"
-      OS=`cat /tmp/os_detect | grep "Operating System tag" | cut -f4 -d " "`
-    
-      echo "Local Node OS Version : $OS"
-    else
-      OS=`cat /tmp/os_detect | grep "Operating System tag" | cut -f4 -d " "`
-    fi
-  else
-    if [ "$OS" == "" ] ; then
-      echo ""
-      echo "Operating System name doesn't match any of the supported OS's"
-      if [ $LOGFILE == true ] ; then
-        exit 1
-      fi
-
-      echo "Please select from this OS list or enter 'exit'"
-      for SUPPORTED_OS in "${OS_LIST[@]}"; do
-        echo "$SUPPORTED_OS"
-      done
-
-      read -p "Enter OS or 'exit' > " answer
-      if [ $answer == 'exit' ] ; then
-        exit 1
-      fi
-      match=false
-      for SUPPORTED_OS in "${OS_LIST[@]}"; do
-        if [ $SUPPORTED_OS == $answer ] ; then
-          match=true
-          break;
-        fi
-      done
-
-      if [ $match == "false" ] ; then 
-        echo "OS version unknown, please re-run and provide the OS in the command line --os"
-        exit 1
-      fi
-    fi
-  fi
-}
- 
-checkLocalDir()
-{
-    if [ "$USER" != "root" ]; then
-      # Non-root User directory permissions check
-      #
-      echo ""
-      echo "** Run Non-root User directory permissions check on Local Node"
-      echo ""
-      
-      #remove any check tmp files from previous runs
-      `sudo rm -f /tmp/*_check > /dev/null 2>&1`
-      
-      #check /tmp and /dev/shm
-      pass=true
-      `touch /tmp/cs_check > /dev/null 2>&1`
-      if [ "$?" -eq 0 ]; then
-	echo "Local Node permission test on /tmp : Passed"
-	`rm -f /tmp/cs_check`
-      else
-	echo "Local Node permission test on /tmp : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	exit 1
-      fi
-
-      `touch /dev/shm/cs_check > /dev/null 2>&1`
-      if [ "$?" -eq 0 ]; then
-	echo "Local Node permission test on /dev/shm : Passed"
-	`rm -f /dev/shm/cs_check`
-      else
-	echo "Local Node permission test on /dev/shm : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	pass=false
-	REPORTPASS=false
-      fi
-    fi
-}
-
-checkPing()
-{
-    # ping test
-    #
-    echo ""
-    echo "** Run Ping access Test to remote nodes"
-    echo ""
-
-    for ipadd in "${NODE_IPADDRESS[@]}"; do
-
-      `ping $ipadd -c 1 -w 5 > /dev/null 2>&1`
-      if [ "$?" -eq 0 ]; then
-	echo $ipadd " Node Passed ping test"
-      else
-	echo $ipadd " Node ${bold}Failed${normal} ping test, correct and retest"
-	exit 1
-      fi
-    done
-}
-
-checkSSH()
-{
-  # Login test
-  #
-  echo ""
-  echo "** Run SSH Login access Test to remote nodes"
-  echo ""
-
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `./remote_command.sh $ipadd $PASSWORD ls 1 > /dev/null 2>&1`;
-    rc="$?"
-    if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-      if [ $PASSWORD == "ssh" ] ; then
-	echo $ipadd " Node Passed SSH login test using ssh-keys"
-      else
-	echo $ipadd " Node Passed SSH login test using user password"
-      fi
-    else
-      if [ $PASSWORD == "ssh" ] ; then
-	echo $ipadd " Node ${bold}Failed${normal} SSH login test using ssh-keys"
-      else
-	echo $ipadd " Node ${bold}Failed${normal} SSH login test using user password"
-      fi
-      exit 1
-    fi
-  done
-}
-
-checkRemoteDir()
-{
-  #
-  # remove old _check tmp files from remote servers
-  
-  `sudo rm -f /tmp/*_check > /dev/null 2>&1`
-  
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `./remote_command.sh $ipadd $PASSWORD 'sudo rm -f /tmp/*_check > /dev/null 2>&1' 1 > /tmp/remote_command_check 2>&1`
-  done
-
-  if [ "$USER" != "root" ]; then
-    # Non-root User directory permissions check
-    #
-    echo ""
-    echo "** Run Non-root User directory permissions check on remote nodes"
-    echo ""
-
-    for ipadd in "${NODE_IPADDRESS[@]}"; do
-      `./remote_command.sh $ipadd $PASSWORD 'touch /tmp/cs_check' 1 > /tmp/remote_command_check 2>&1`
-      rc="$?"
-      if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	`grep "Permission denied" /tmp/remote_command_check  > /dev/null 2>&1`
-	if [ "$?" -eq 0 ]; then
-	  echo "$ipadd Node permission test on /tmp : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	  exit 1
-	else
-	  echo "$ipadd Node permission test on /tmp : Passed"
-	fi
-      else
-	  echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-	  pass=false
-	  REPORTPASS=false
-      fi
-
-      `./remote_command.sh $ipadd $PASSWORD 'touch /dev/shm/cs_check' 1 > /tmp/remote_command_check 2>&1`
-      rc="$?"
-      if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	`grep "Permission denied" /tmp/remote_command_check  > /dev/null 2>&1`
-	if [ "$?" -eq 0 ]; then
-	  echo "$ipadd Node permission test on /dev/shm : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	  pass=false
-	  REPORTPASS=false
-	else
-	  echo "$ipadd Node permission test on /dev/shm : Passed"
-	fi
-      else
-	echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-	pass=false
-	REPORTPASS=false
-      fi
-    done
-    
-    if ! $pass; then
-      checkContinue
-    fi
-  fi
-}
-
-checkOS()
-{
-  # Os check
-  #
-  echo ""
-  echo "** Run OS check - OS version needs to be the same on all nodes"
-  echo ""
-
-  echo "Local Node OS Version : $localOS"
-  echo ""
-  
-  pass=true
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `./remote_scp_put.sh $ipadd $PASSWORD os_detect.sh 1 > /tmp/remote_scp_put_check 2>&1`
-    if [ "$?" -ne 0 ]; then
-      echo "Error running remote_scp_put.sh to $ipadd Node, check /tmp/remote_scp_put_check"
-    else
-      `./remote_command.sh $ipadd $PASSWORD './os_detect.sh > /tmp/os_detect 2>&1' 1 > /tmp/remote_command_check`
-      rc="$?"
-      if  [ $rc -eq 0 ] ; then
-	`./remote_scp_get.sh $ipadd $PASSWORD /tmp/os_detect > /tmp/remote_scp_get_check 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-	else
-	  remoteOS=`cat os_detect | grep "Operating System name" | cut -f2 -d '"'`
-	  echo "$ipadd Node OS Version : $remoteOS"
-	  if [ $localOS != $remoteOS ]; then
-	    echo "${bold}Failed${normal}, $ipadd has a different OS than local node"
-	    pass=false
-	    REPORTPASS=false
-	  fi
-	  rm -f os_detect
-	fi
-      else
-	echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-	pass=false
-	REPORTPASS=false
-      fi
-    fi
-  done
-
-  if ! $pass; then
-    checkContinue
-  fi
-}
-
-checkLocale()
-{
-  # Locale check
-  #
-  echo ""
-  echo "** Run Locale check - Locale needs to be the same on all nodes"
-  echo ""
-  
-  #get local Locale
-  `locale | grep LANG= > /tmp/locale_check 2>&1`
-  if [ "$?" -eq 0 ]; then
-    echo "Local Node Locale : `cat /tmp/locale_check`"
-  else
-    echo "Error running 'locale' command on local node"
-  fi
-  
-  pass=true
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `./remote_command.sh $ipadd $PASSWORD 'locale | grep LANG= > /tmp/locale_check 2>&1' 1 > /tmp/remote_command_check`
-    rc="$?"
-     if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-      `./remote_scp_get.sh $ipadd $PASSWORD /tmp/locale_check > /tmp/remote_scp_get_check 2>&1`
-      if [ "$?" -ne 0 ]; then
-	echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-      else
-	echo "$ipadd Node Locale : `cat locale_check`"
-	`diff /tmp/locale_check locale_check > /dev/null 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "${bold}Failed${normal}, $ipadd has a different Locale setting than local node"
-	  pass=false
-	  REPORTPASS=false
-	fi
-	`rm -f locale_check`
-      fi
-    else
-      echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-      pass=false
-      REPORTPASS=false
-    fi
-  done
-  
-  if ! $pass; then
-    checkContinue
-  fi
-}
-
-checkSELINUX()
-{
-  # SELINUX check
-  #
-  echo ""
-  echo "** Run SELINUX check - Setting should to be disabled on all nodes"
-  echo ""
-  
-  pass=true
-  #check local SELINUX
-  if [ -f /etc/selinux/config ]; then
-    `cat /etc/selinux/config | grep SELINUX | grep enforcing > /tmp/selinux_check 2>&1`
-    if [ "$?" -eq 0 ]; then
-      echo "${bold}Failed${normal}, Local Node SELINUX setting is Enabled, please disable"
-      pass=false
-      REPORTPASS=false
-    else
-      echo "Local Node SELINUX setting is Not Enabled"
-    fi
-  else
-      echo "Local Node SELINUX setting is Not Enabled"
-  fi
-  
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `./remote_scp_get.sh $ipadd $PASSWORD /etc/selinux/config > /tmp/remote_scp_get_check 2>&1`
-    if [ "$?" -ne 0 ]; then
-      echo "$ipadd Node SELINUX setting is Not Enabled"
-    else
-     `cat config | grep SELINUX | grep enforcing > /tmp/selinux_check 2>&1`
-    if [ "$?" -eq 0 ]; then
-      echo "${bold}Failed${normal}, $ipadd SELINUX setting is Enabled, please disable"
-      pass=false
-      REPORTPASS=false
-    else
-      echo "$ipadd Node SELINUX setting is Not Enabled"
-    fi
-      `rm -f config`
-    fi
-  done
-
-  if ! $pass; then
-    checkContinue
-  fi
-}
-
-checkFirewalls()
-{
-  # FIREWALL checks
-  #
-  echo ""
-  echo "** Run Firewall Services check - Firewall Services should to be disabled on all nodes"
-  echo ""
-
-  declare -a FIREWALL_LIST=("iptables" "ufw" "firewalld" "firewall")
-
-  fpass=true
-  #check local FIREWALLS
-  `chkconfig > /tmp/firewall_check 2>&1`
-  for firewall in "${FIREWALL_LIST[@]}"; do
-    pass=true
-    `cat /tmp/firewall_check | grep $firewall | grep on > /dev/null 2>&1`
-    if [ "$?" -eq 0 ]; then
-      echo "${bold}Failed${normal}, Local Node $firewall service is Enabled in chkconfig, please disable"
-      pass=false
-      fpass=false
-      REPORTPASS=false
-    fi
-
-    `systemctl status $firewall > /tmp/firewall1_check 2>&1`
-    `cat /tmp/firewall1_check | grep "Active: active" > /dev/null 2>&1`
-    if [ "$?" -eq 0 ]; then
-      echo "${bold}Failed${normal}, Local Node $firewall service is Enabled in systemctl, please disable"
-      pass=false
-      fpass=false
-      REPORTPASS=false
-    fi
-
-    if $pass ; then
-      echo "Local Node $firewall service is Not Enabled"
-    fi
-  done
-
-  if ! $fpass; then
-    checkContinue
-  fi
-  
-  echo ""
-  fpass=true
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `./remote_command.sh $ipadd $PASSWORD 'chkconfig > /tmp/firewall_check 2>&1' 1 > /tmp/remote_command_check`
-     rc="$?"
-     if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	`./remote_scp_get.sh $ipadd $PASSWORD /tmp/firewall_check > /tmp/remote_scp_get_check 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-	else
-	  for firewall in "${FIREWALL_LIST[@]}"; do
-	    pass=true
-	    `cat firewall_check | grep $firewall | grep on > /dev/null 2>&1`
-	    if [ "$?" -eq 0 ]; then
-	      echo "${bold}Failed${normal}, $ipadd Node $firewall service is Enabled in chkconfig, please disable"
-	      pass=false
-	      fpass=false
-	      REPORTPASS=false
-	    fi
-
-	    `./remote_command.sh $ipadd $PASSWORD "systemctl status '$firewall' > /tmp/firewall1_check 2>&1" 1 > /tmp/remote_command_check`
-	    rc="$?"
-	    if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	      `./remote_scp_get.sh $ipadd $PASSWORD /tmp/firewall1_check > /tmp/remote_scp_get_check 2>&1`
-	      if [ "$?" -ne 0 ]; then
-		echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-	      else
-		`cat firewall1_check | grep "Active: active" > /dev/null 2>&1`
-		if [ "$?" -eq 0 ]; then
-		  echo "${bold}Failed${normal}, $ipadd Node $firewall service is Enabled in systemctl, please disable"
-		  pass=false
-		  fpass=false
-		  REPORTPASS=false
-		fi
-		`rm -f firewall1_check`
-	      fi
-	    fi
-
-	    if $pass ; then
-	      echo "$ipadd Node $firewall service is Not Enabled"
-	    fi
-	  done
-	    
-	  `rm -f firewall_check`
-	fi
-    else
-      # 'sysconfig not on remote node
-      for firewall in "${FIREWALL_LIST[@]}"; do
-	pass=true
-	`./remote_command.sh $ipadd $PASSWORD "systemctl status '$firewall' > /tmp/firewall1_check 2>&1" 1 > /tmp/remote_command_check`
-	rc="$?"
-	if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	  `./remote_scp_get.sh $ipadd $PASSWORD /tmp/firewall1_check > /tmp/remote_scp_get_check 2>&1`
-	  if [ "$?" -ne 0 ]; then
-	    echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-	  else
-	    `cat firewall1_check | grep "Active: active" > /dev/null 2>&1`
-	    if [ "$?" -eq 0 ]; then
-	      echo "${bold}Failed${normal}, $ipadd Node $firewall service is Enabled in systemctl, please disable"
-	      pass=false
-	      fpass=false
-	      REPORTPASS=false
-	    fi
-	    `rm -f firewall1_check`
-	    
-	    if $pass ; then
-	      echo "$ipadd Node $firewall service is Not Enabled"
-	    fi
-	  fi
-	fi
-
-	if $pass ; then
-	  echo "$ipadd Node $firewall service is Not Enabled"
-	fi
-      done
-    fi
-
-  echo ""
-  done
-
-  if ! $fpass; then
-    checkContinue
-  fi
-  
-  if [ $OS == "suse12" ]; then
-    # rcSuSEfirewall2 check
-    #
-    echo ""
-    echo "** Run rcSuSEfirewall2 check - Service should to be disabled on all nodes"
-    echo ""
-    
-    pass=true
-    #check local IPTABLES
-    `/sbin/rcSuSEfirewall2 status > /tmp/rcSuSEfirewall2_check 2>&1`
-    `cat /tmp/rcSuSEfirewall2_check | grep active > /dev/null 2>&1`
-    if [ "$?" -eq 0 ]; then
-      echo "${bold}Failed${normal}, Local Node rcSuSEfirewall2 service is Enabled, please disable"
-      pass=false
-      REPORTPASS=false
-    else
-      echo "Local Node rcSuSEfirewall2 service is Not Enabled"
-    fi
-
-    for ipadd in "${NODE_IPADDRESS[@]}"; do
-      `./remote_command.sh $ipadd $PASSWORD '/sbin/rcSuSEfirewall2 status > /tmp/rcSuSEfirewall2_check 2>&1' 1 > /tmp/remote_command_check`
-      rc="$?"
-      if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	`./remote_scp_get.sh $ipadd $PASSWORD /tmp/rcSuSEfirewall2_check > /tmp/remote_scp_get_check 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-	else
-	  `cat rcSuSEfirewall2_check | grep active > /dev/null 2>&1`
-	  if [ "$?" -eq 0 ]; then
-	    echo "${bold}Failed${normal}, $ipadd Node rcSuSEfirewall2 service is Enabled, please disable"
-	    pass=false
-	    REPORTPASS=false
-	  else
-	    echo "$ipadd Node rcSuSEfirewall2 service is Not Enabled"
-	  fi
-	  `rm -f rcSuSEfirewall2_check`
-	fi
-      else
-	echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-	pass=false
-	REPORTPASS=false
-      fi
-    done
-
-    if ! $pass; then
-      checkContinue
-    fi
-  fi
-}
-
-checkPorts()
-{
-  # port test
-  #
-  echo ""
-  echo "** Run MariaDB ColumnStore Port (8600-8620) availibility test"
-  echo ""
-
-  pass=true
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-
-    `nmap $ipadd -p 8600-8620 | grep 'closed unknown' > /dev/null`
-    if [ "$?" -eq 0 ]; then
-      echo $ipadd " Node Passed port test"
-    else
-      echo $ipadd " Node ${bold}Failed${normal} port test, check and disable any firwalls that were reported enabled"
-      pass=false
-      REPORTPASS=false
-    fi
-  done
-
-  if ! $pass; then
-    checkContinue
-  fi
-}
-
-checkTime()
-{
-  # Time check
-  #
-  echo ""
-  echo "** Run Date/Time check - Date/Time should be within 10 seconds on all nodes"
-  echo ""
-  
-  pass=true
-  #get local epoch time
-  localTime=`date +%s`
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-     `./remote_command.sh $ipadd $PASSWORD 'date +%s > /tmp/time_check' > /tmp/time_check`
-      rc="$?"
-      if  [ $rc -ne 0 ] ; then
-	  echo $ipadd " Node ${bold}Failed${normal} date/time check failed, check /tmp/time_check"
-	  pass=false
-	  REPORTPASS=false
-      else
-	`./remote_scp_get.sh $ipadd $PASSWORD /tmp/time_check > /tmp/remote_scp_get_check 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-	else
-	  remoteTime=`cat time_check`
-	  timeDiff=`echo "$(($remoteTime-$localTime))"`
-	  range=10
-	  if [ $timeDiff -gt $range ] || [ $timeDiff -lt -$range ] ; then
-	    echo $ipadd " Node ${bold}Failed${normal}, $ipadd Node date/time is more than 10 seconds away from local node"
-	    pass=false
-	  else
-	    echo "Passed: $ipadd Node date/time is within 10 seconds of local node"
-	    fi
-	fi  
-      fi
-  done
-  `rm -f time_check`
-
-  if ! $pass; then
-    checkContinue
-  fi
-}
-
-checkPackages()
-{
-  #
-  # now check packaging on local and remote nodes
-  #
-
-  echo ""
-  echo "** Run MariaDB ColumnStore Dependent Package Check"
-  echo ""
-
-  declare -a CENTOS_PKG=("boost" "expect" "perl" "perl-DBI" "openssl" "zlib" "file" "sudo" "perl-DBD-MySQL" "libaio" "rsync" "snappy" "net-tools")
-
-  if [ "$OS" == "centos6" ] || [ "$OS" == "centos7" ]; then
-    if [ ! `which yum 2>/dev/null` ] ; then
-      echo "${bold}Failed${normal}, Local Node ${bold}yum${normal} package not installed"
-      pass=false
-      REPORTPASS=false
-    else
-      pass=true
-      #check centos packages on local node
-      for PKG in "${CENTOS_PKG[@]}"; do
-	if [ $OS == "centos6" ] && [ "$PKG" == "boost" ]; then
-	  `ls /usr/lib/libboost_regex.so > /dev/null 2>&1`
-	  if [ "$?" -ne 0 ]; then
-	    echo "${bold}Failed${normal}, Local Node ${bold}boost libraries${normal} not installed"
-	    pass=false
-	    REPORTPASS=false
-	  fi
-	else
-	  `yum list installed "$PKG" > /tmp/pkg_check 2>&1`
-	  `cat /tmp/pkg_check | grep Installed > /dev/null 2>&1`
-	  if [ "$?" -ne 0 ]; then
-	    echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
-	    pass=false
-	    REPORTPASS=false
-	  fi
-	fi
-      done
-    fi
-
-    if [ $pass == true ] ; then
-      echo "Local Node - Passed, all dependency packages are installed"
-    else
-      checkContinue
-    fi
-
-    echo ""
-    pass=true
-    if [ "$IPADDRESSES" != "" ]; then
-      for ipadd in "${NODE_IPADDRESS[@]}"; do
-	for PKG in "${CENTOS_PKG[@]}"; do
-	  if [ $OS == "centos6" ] && [ $PKG == "boost" ]; then
-	    `./remote_command.sh $ipadd $PASSWORD 'ls /usr/lib/libboost_regex.so > /dev/null 2>&1' 1 > /tmp/remote_command_check 2>&1`
-	    if  [ $? -ne 0 ] ; then
-	      echo "${bold}Failed${normal}, $ipadd Node ${bold}boost libraries${normal} not installed"
-	      pass=false
-	      REPORTPASS=false
-	    fi
-	  else
-	    `./remote_command.sh $ipadd $PASSWORD "yum list installed '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-	    rc="$?"
-	    if  [ $rc -eq 2 ] ; then
-              echo "${bold}Failed${normal}, $ipadd Node, 'yum' not installed"
-              pass=false
-              REPORTPASS=false
-              break
-	    elif [ $rc -eq 1 ] ; then
-		echo "${bold}Failed${normal}, $ipadd Node package ${bold}${PKG}${normal} is not installed, please install"
-		pass=false
-		REPORTPASS=false
-	    fi
-	  fi
-	done
-	
-	if $pass; then
-	  echo "$ipadd Node - Passed, all dependency packages are installed"
-	else
-	  checkContinue
-	fi
-	echo ""
-      done
-    fi
-  fi
-
-  declare -a SUSE_PKG=("boost-devel" "expect" "perl" "perl-DBI" "openssl" "file" "sudo" "libaio1" "rsync" "libsnappy1" "net-tools")
-
-  if [ "$OS" == "suse12" ]; then
-    if [ ! `which rpm 2>/dev/null` ] ; then
-      echo "${bold}Failed${normal}, Local Node ${bold}rpm${normal} package not installed"
-      pass=false
-      REPORTPASS=false
-    else
-      pass=true
-      #check centos packages on local node
-      for PKG in "${SUSE_PKG[@]}"; do
-	`rpm -qi "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep "not installed" > /dev/null 2>&1`
-	if [ "$?" -eq 0 ]; then
-	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
-	  pass=false
-	  REPORTPASS=false
-	fi
-      done
-
-      if $pass; then
-	echo "Local Node - Passed, all dependency packages are installed"
-      else
-	checkContinue
-      fi
-    fi
-    
-    echo ""
-    pass=true
-    if [ "$IPADDRESSES" != "" ]; then
-      for ipadd in "${NODE_IPADDRESS[@]}"; do
-	for PKG in "${SUSE_PKG[@]}"; do
-	  `./remote_command.sh $ipadd $PASSWORD "rpm -qi '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-	  rc="$?"
-	  if  [ $rc -ne 0 ] ; then
-	    echo "${bold}Failed${normal}, $ipadd Node package ${bold}${PKG}${normal} is not installed, please install"
-	    pass=false
-	    REPORTPASS=false
-	  fi
-	done
-	
-	if $pass; then
-	  echo "$ipadd Node - Passed, all dependency packages are installed"
-	else
-	  checkContinue
-	fi
-	echo ""
-      done
-    fi
-  fi  
-
-  declare -a UBUNTU_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "libreadline-dev" "rsync" "snappy" "net-tools")
-
-  if [ "$OS" == "ubuntu16" ] ; then
-    if [ ! `which dpkg 2>/dev/null` ] ; then
-      echo "${bold}Failed${normal}, Local Node ${bold}rpm${normal} package not installed"
-      pass=false
-      REPORTPASS=false
-    else
-      pass=true
-      #check centos packages on local node
-      for PKG in "${UBUNTU_PKG[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
-	  pass=false
-	  REPORTPASS=false
-	fi
-      done
-
-      if $pass; then
-	echo "Local Node - Passed, all dependency packages are installed"
-      else
-	checkContinue
-      fi
-    fi
-    
-    echo ""
-    pass=true
-    if [ "$IPADDRESSES" != "" ]; then
-     for ipadd in "${NODE_IPADDRESS[@]}"; do
-      for PKG in "${UBUNTU_PKG[@]}"; do
-        `./remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-        rc="$?"
-        if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-          `./remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
-            if [ "$?" -ne 0 ]; then
-              echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-            else
-              `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
-              if [ "$?" -eq 0 ]; then
-                echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
-                pass=false
-                break
-              else
-                `cat pkg_check | grep 'install ok installed' > /dev/null 2>&1`
-                if [ "$?" -ne 0 ]; then
-                  echo "${bold}Failed${normal}, $ipadd Node package ${bold}${PKG}${normal} is not installed, please install"
-                  pass=false
-                fi
-
-                `rm -f pkg_check`
-              fi
-            fi
-        else
-          echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-          pass=false
-        fi
-      done
-
-      if $pass; then
-        echo "$ipadd Node - Passed, all dependency packages are installed"
-      else
-        checkContinue
-      fi
-      echo ""
-    done
-   fi
-  fi
-
-  declare -a DEBIAN_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "libreadline-dev" "rsync" "libsnappy1" "net-tools")
-
-  if [ "$OS" == "debian8" ]; then
-    if [ ! `which dpkg 2>/dev/null` ] ; then
-      echo "${bold}Failed${normal}, Local Node ${bold}rpm${normal} package not installed"
-      pass=false
-      REPORTPASS=false
-    else    
-      pass=true
-      #check centos packages on local node
-      for PKG in "${DEBIAN_PKG[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
-	if [ "$?" -ne 0 ]; then
-	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
-	  pass=false
-	  REPORTPASS=false
-	fi
-      done
-
-      if $pass; then
-	echo "Local Node - Passed, all dependency packages are installed"
-      else
-	checkContinue
-      fi
-    fi
-    
-    echo ""
-    pass=true
-    if [ "$IPADDRESSES" != "" ]; then
-     for ipadd in "${NODE_IPADDRESS[@]}"; do
-      for PKG in "${DEBIAN_PKG[@]}"; do
-        `./remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-        rc="$?"
-        if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-          `./remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
-            if [ "$?" -ne 0 ]; then
-              echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
-            else
-              `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
-              if [ "$?" -eq 0 ]; then
-                echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
-                pass=false
-                break
-              else
-                `cat pkg_check | grep 'install ok installed' > /dev/null 2>&1`
-                if [ "$?" -ne 0 ]; then
-                  echo "${bold}Failed${normal}, $ipadd Node package ${bold}${PKG}${normal} is not installed, please install"
-                  pass=false
-                fi
-
-                `rm -f pkg_check`
-              fi
-            fi
-        else
-          echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-          pass=false
-        fi
-      done
-
-      if $pass; then
-        echo "$ipadd Node - Passed, all dependency packages are installed"
-      else
-        checkContinue
-      fi
-      echo ""
-     done
-    fi
-  fi
-}
-
-echo ""  
-echo "*** This is the MariaDB Columnstore Cluster System test tool ***"
-echo ""
-
-checkLocalOS
-checkLocalDir
-if [ "$IPADDRESSES" != "" ]; then
-  checkPing
-  checkSSH
-  checkRemoteDir
-  checkOS
-  checkLocale
-  checkSELINUX
-  checkFirewalls
-  checkPorts
-  checkTime
-fi
-checkPackages
-
-if [ $REPORTPASS == true ] ; then
-  echo ""
-  echo "*** Finished Validation of the Cluster, all Test Passed ***"
-  echo ""
-  exit 0
-else
-  echo ""
-  echo "*** Finished Validation of the Cluster, Failures occurred. Check for Error/Failed test results ***"
-  echo ""
-  exit 1
-fi
-
diff --git a/utils/clusterTester/david/os_detect.sh b/utils/clusterTester/david/os_detect.sh
deleted file mode 100755
index 1f76a3716..000000000
--- a/utils/clusterTester/david/os_detect.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-detectOS () {
-   checkFile1=/etc/os-release
-   checkFile2=/etc/centos-release
-   if [ -f "$checkFile1" ]
-   then
-      osPrettyName=`cat $checkFile1 | grep PRETTY_NAME|awk -F"=" '{print $2}'`
-      osVersionID=`cat $checkFile1 | grep VERSION_ID | awk -F"=" '{print $2}' | awk -F"." '{print $1}' | sed 's/"//g'`
-   else
-      osPrettyName=`head -n 1 $checkFile2`
-      osVersionID=`echo $osPrettyName | awk -F" " '{print $3}' | awk -F"." '{print $1}'`
-   fi
-#
-   osName=`echo $osPrettyName | awk -F" " '{print $1}' | sed 's/"//g'`
-   if [ -z "$osPrettyName" ]
-   then
-     osPrettyName=`uname -o -s -r -v`
-   fi
-   if [ -z "$osName" ] || [ -z "$osVersionID" ]
-   then
-      osTag=""
-   else
-         osTag=`echo $osName$osVersionID | awk '{print tolower($0)}'`
-   fi
-}
-#
-   detectOS
-   echo Operating System name: $osPrettyName
-   echo Operating System tag:  $osTag
-   case "$osTag" in
-      centos6|centos7|ubuntu16|debian8|suse12)
-         ;;
-      *)
-         echo OS not supported
-	 exit 1
-         ;;
-   esac
-   
-   exit 0
diff --git a/utils/clusterTester/david/remote_command.sh b/utils/clusterTester/david/remote_command.sh
deleted file mode 100755
index 4525a4ed3..000000000
--- a/utils/clusterTester/david/remote_command.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/expect
-#
-# $Id: remote_command.sh 3495 2012-12-17 22:51:40Z dhill $
-#
-# Remote command execution script to another server
-# Argument 1 - Remote Server Host Name or IP address
-# Argument 2 - Remote Server password
-# Argument 3 - Command
-# Argument 4 - debug flag
-# Argument 5 - Remote user name (optional)
-# Argument 6 - Force a tty to be allocated (optional)
-set stty_init {cols 512 -opost};
-set timeout 10
-set SERVER [lindex $argv 0]
-set PASSWORD [lindex $argv 1]
-set COMMAND [lindex $argv 2]
-set DEBUG [lindex $argv 3]
-
-if {[info exists env(USER)]} {
-    set USERNAME $env(USER)
-} else {
-    set USERNAME "root"
-}
-
-set UNM [lindex $argv 4]
-if { $UNM != "" && $UNM != "-" } {
-	set USERNAME "$UNM"
-}
-set TTY ""
-set TTYOPT [lindex $argv 5]
-if { $TTYOPT != "" } {
-	set TTY "-t"
-}
-log_user $DEBUG
-spawn -noecho /bin/bash
-#expect -re {[$#] }
-
-if { $PASSWORD == "ssh" } {
-	set PASSWORD ""
-}
-
-# 
-# send command
-#
-send "ssh -v $TTY $USERNAME@$SERVER '$COMMAND'\n"
-expect {
-	"cannot access" { exit 1}
-	"Host key verification failed" { send_user "FAILED: Host key verification failed\n" ; exit 1}
-	"service not known"    { send_user "           FAILED: Invalid Host\n" ; exit 1}
-	"ssh: connect to host" { send_user "           FAILED: Invalid Host\n" ; exit 1 }
-	"Connection refused"   { send_user "ERROR: Connection refused\n" ; exit 1 }
-	"Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-	"authenticity" { send "yes\n" 
-						 expect {
-						 	"word: " { send "$PASSWORD\n" }
-							"passphrase" { send "$PASSWORD\n" }
-						 }
-						}
-	"word: " { send "$PASSWORD\n" }
-	"passphrase" { send "$PASSWORD\n" }
-	"command not found" { exit 3 }
-#	-re {[$#] } { exit 0 }
-	"Exit status 0" { exit 0 }
-        "Exit status 1" { exit 1 }
-        "Exit status 3" { exit 1 }
-        "Exit status 4" { exit 1 }
-	timeout { exit 2 }
-        "Permission denied, please try again"         { send_user "FAILED: Invalid password\n" ; exit 1 }
-}
-expect {
-	"command not found" { exit 3 }
-#	-re {[$#] } { exit 0 }
-        "Exit status 0" { exit 0 }
-        "Exit status 1" { exit 1 }
-        "Exit status 3" { exit 1 }
-        "Exit status 4" { exit 1 }
-	timeout { exit 2 }
-        "cannot access" { exit 1}
-        "Permission denied, please try again"         { send_user "FAILED: Invalid password\n" ; exit 1 }
-
-	"(y or n)"  { send "y\n" 
-				"command not found" { exit 3 }
-#				expect -re {[$#] } { exit 0 }
-				"Exit status 0" { exit 0 }
-        			"Exit status 1" { exit 1 }
-			        "Exit status 3" { exit 1 }
-        			"Exit status 4" { exit 1 }
-				timeout { exit 2 }	
-	}
-}
-exit 0
-
diff --git a/utils/clusterTester/david/remote_scp_get.sh b/utils/clusterTester/david/remote_scp_get.sh
deleted file mode 100755
index aee668b13..000000000
--- a/utils/clusterTester/david/remote_scp_get.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/expect
-#
-# $Id: remote_commend.sh 421 2007-04-05 15:46:55Z dhill $
-#
-# Remote command execution script to another server
-# Argument 1 - Remote Server Host Name or IP address
-# Argument 2 - Remote Server root password
-# Argument 3 - Command
-set timeout 10
-set USERNAME $env(USER)"@"
-set SERVER [lindex $argv 0]
-set PASSWORD [lindex $argv 1]
-set FILE [lindex $argv 2]
-set DEBUG [lindex $argv 3]
-log_user $DEBUG
-spawn -noecho /bin/bash
-
-if { $PASSWORD == "ssh" } {
-	set PASSWORD ""
-}
-
-# 
-# send command
-#
-#expect -re {[$#] }
-send "scp -v $USERNAME$SERVER:$FILE .\n"
-expect {
-	"Exit status 0" { exit 0 }
-        "Exit status 1" { exit 1 }
-        "100%"                                          { send_user "DONE\n" ; exit 0 }
-	"authenticity" { send "yes\n" 
-						expect {
-							"word: " { send "$PASSWORD\n" }
-							"passphrase" { send "$PASSWORD\n" }
-							}
-						}
-	"service not known" { send_user "FAILED: Invalid Host\n" ; exit 1 }
-	"Connection refused"   { send_user "ERROR: Connection refused\n" ; exit 1 }
-	"Connection timed out" { send_user "FAILED: Connection timed out\n" ; exit 1 }
-	"lost connection" { send_user "FAILED: Connection refused\n" ; exit 1 }
-	"Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-	"word: " { send "$PASSWORD\n" }
-	"passphrase" { send "$PASSWORD\n" }
-        "scp:"   { send_user "FAILED\n" ; exit 1 }
-        "Permission denied, please try again"         { send_user "FAILED: Invalid password\n" ; exit 1 }
-}
-expect {
-	"Exit status 0" { exit 0 }
-        "Exit status 1" { exit 1 }
-	"100%" 						{ send_user "DONE\n" ; exit 0 }
-	"scp:"  					{ send_user "FAILED\n" ; exit 1 }
-	"Permission denied, please try again"         { send_user "FAILED: Invalid password\n" ; exit 1 }
-	"No such file or directory" { send_user "FAILED: No such file or directory\n" ; exit 1 }
-	"Connection refused"   { send_user "ERROR: Connection refused\n" ; exit 1 }
-	"Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-}
-exit 0
-
diff --git a/utils/clusterTester/david/remote_scp_put.sh b/utils/clusterTester/david/remote_scp_put.sh
deleted file mode 100755
index 7eb6c1ecb..000000000
--- a/utils/clusterTester/david/remote_scp_put.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/expect
-#
-# $Id: remote_commend.sh 421 2007-04-05 15:46:55Z dhill $
-#
-# Remote command execution script to another server
-# Argument 1 - Remote Server Host Name or IP address
-# Argument 2 - Remote Server root password
-# Argument 3 - Command
-set timeout 30
-set USERNAME $env(USER)"@"
-set SERVER [lindex $argv 0]
-set PASSWORD [lindex $argv 1]
-set FILE [lindex $argv 2]
-set DEBUG [lindex $argv 3]
-log_user $DEBUG
-spawn -noecho /bin/bash
-
-if { $PASSWORD == "ssh" } {
-	set PASSWORD ""
-}
-
-# 
-# send command
-#
-send "scp -v $FILE $USERNAME$SERVER:$FILE\n"
-expect {
-	"Exit status 0" { exit 0 }
-        "Exit status 1" { exit 1 }
-        -re "100%"                      { send_user "DONE\n" ; sleep 2; exit 0 }
-	-re "authenticity" { send "yes\n" 
-						expect {
-							-re "word: " { send "$PASSWORD\n" }
-							-re "passphrase" { send "$PASSWORD\n" }
-							}
-						}
-	-re "service not known" { send_user "FAILED: Invalid Host\n" ; exit 1 }
-	-re "Connection refused" { send_user "FAILED: Connection refused\n" ; exit 1 }
-	-re "Connection timed out" { send_user "FAILED: Connection timed out\n" ; exit 1 }
-	-re "lost connection" { send_user "FAILED: Connection refused\n" ; exit 1 }
-	-re "Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-	-re "word: " { send "$PASSWORD\n" }
-	-re "passphrase" { send "$PASSWORD\n" }
-	-re "WARNING:" { send "rm -f /root/.ssh/known_hosts" ; exit 1 }
-        -re "Permission denied, please try again"         { send_user "FAILED: Invalid password\n" ; exit 1 }
-}
-expect {
-	"Exit status 0" { exit 0 }
-        "Exit status 1" { exit 1 }
-	-re "100%" 			{ send_user "DONE\n" ; sleep 2 ; exit 0 }
-	-re "scp:"  					{ send_user "FAILED\n" ; exit 1 }
-	-re "Permission denied, please try again"         { send_user "FAILED: Invalid password\n" ; exit 1 }
-	-re "No such file or directory" { send_user "FAILED: Invalid file\n" ; exit 1 }
-	-re "Connection refused" { send_user "FAILED: Connection refused\n" ; exit 1 }
-	-re "Connection closed"   { send_user "ERROR: Connection closed\n" ; exit 1 }
-}
-exit 0
-