TMI-39: Cleanup after merge.