Attempting to improve folder deletion (still not recursive yet)