some cleanup to be sure