A little cleanup to prevent future problems