Cleanup to keep brad happy