Cleanup to merge