Code cleanup.
Repo cleanup.