Remove left over code from merge conflict fixes