cleanup OneOr instances. OneOrApply is unnecessary
Merge pull request #433 from xuwei-k/request/cleanup-OneOr

cleanup OneOr instances. OneOrApply is unnecessary