Try to speedup data cleanup