Fix the clean up machine issues and remove unused files

Change-Id: Id771af885c14eb56a1b918ffdb58f7a0cbea8da7
diff --git a/jjb/OnosSystemTest/cho-clean-up.sh b/jjb/OnosSystemTest/cho-clean-up.sh
index a21a274..c83f223 100644
--- a/jjb/OnosSystemTest/cho-clean-up.sh
+++ b/jjb/OnosSystemTest/cho-clean-up.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ./clean-up.sh
-
 echo -e "\n Before clean up disk usage: \n"
 df -h
 
@@ -29,4 +27,4 @@
 done
 
 echo -e "\n After clean up disk usage:\n"
-df -h
\ No newline at end of file
+df -h
diff --git a/jjb/OnosSystemTest/clean-up.sh b/jjb/OnosSystemTest/clean-up.sh
deleted file mode 100644
index bfcb47a..0000000
--- a/jjb/OnosSystemTest/clean-up.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-function beforeClean{
-    echo -e "\n Before clean up disk usage: \n"
-    df -h
-}
-function cdTolog{
-    cd /home/$1/OnosSystemTest/TestON/logs
-}
-function cleaning{
-    if [ $? -eq 0 ]
-    then
-        echo "Checking if there are logs older than ${DAYS_OLD} days...."
-        for i in $(find . -mtime +${DAYS_OLD} -type d)
-        do
-        echo -e "DIRs older than $DAYS_OLD are: "
-        echo $i
-        rm -rf $i
-        done
-    fi
-}
-function afterClean{
-    echo -e "\n After clean up disk usage:\n"
-    df -h
-
-}
diff --git a/jjb/OnosSystemTest/vm-bm-clean-up.sh b/jjb/OnosSystemTest/vm-bm-clean-up.sh
index 5f0fd87..5a5651c 100644
--- a/jjb/OnosSystemTest/vm-bm-clean-up.sh
+++ b/jjb/OnosSystemTest/vm-bm-clean-up.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ./clean-up.sh
-
 echo -e "\n Before clean up disk usage: \n"
 df -h
 cd /home/{user}/OnosSystemTest/TestON/logs
@@ -18,4 +16,4 @@
 fi
 
 echo -e "\n After clean up disk usage:\n"
-df -h
\ No newline at end of file
+df -h