Removed some artifacts from a merge.