Project cleanup to reduce warnings.