Query deleteAll corrections
Import cleanup