diff --git a/jjb/OnosSystemTest/cho-clean-up.sh b/jjb/OnosSystemTest/cho-clean-up.sh
index f466d10..a21a274 100644
--- a/jjb/OnosSystemTest/cho-clean-up.sh
+++ b/jjb/OnosSystemTest/cho-clean-up.sh
@@ -2,11 +2,21 @@
 
 source ./clean-up.sh
 
-{beforeClean}
+echo -e "\n Before clean up disk usage: \n"
+df -h
 
 cd /home/admin/OnosSystemTest/TestON/logs
 
-{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
 
 cd /var/lib/jenkins/workspace/OnosProdCHOpost
 
@@ -18,4 +28,5 @@
 rm -rf $i
 done
 
-{afterClean}
+echo -e "\n After clean up disk usage:\n"
+df -h
\ No newline at end of file