cleanup to general list