More code cleanup to get project in sync.