Some administrative cleanup.