cleanup to get things working again