Another part of repo cleanup changes.