diff --git a/tools/dev/bin/onos-setup-karaf b/tools/dev/bin/onos-setup-karaf
index 81168d4..edb2f33 100755
--- a/tools/dev/bin/onos-setup-karaf
+++ b/tools/dev/bin/onos-setup-karaf
@@ -46,8 +46,8 @@
 
 # If clean option was specified, wipe-out existing installation
 if [ "$CLEAN" = "true" ]; then
-    echo "Removing existing ONOS Karaf, apps, and config directories..."
-    [ -d $KARAF_ROOT ] && rm -fr $KARAF_ROOT $STAGE/apps $STAGE/config
+    echo "Removing existing ONOS Karaf, apps, data and config directories..."
+    [ -d $KARAF_ROOT ] && rm -fr $KARAF_ROOT $STAGE/apps $STAGE/data $STAGE/config
 fi
 
 # If IP was not given, nor configured attempt to use ONOS_NIC env. variable