QDA:cleanup is fixed