Remove wayward code from a merge