Cleanup to avoid notice