Data wipe fix

There is a recursive delete of data left behind.