removing unused folders
fixing infinite loop on wipe