Project cleanup.
Synced with iOS repo.