Cleanup to keep tests happy