Code cleanup to remove warnings.