Cleanup from merge.