Remove conf options mistakenly added during rebase