> Let's go ahead and choose one or the other, no need to have both.

Done, see new commit 1f075a4.