Cleanup to eliminate warnings