Some cleanup after merge.