Deleted some vestigial merging junk.