Remove some reminants of a past bad git merge

@preillyme