remove a few defaults; fixes duplicate git-core definition