Cleanup to remove warnings.