Don't mix bitwise and relational operators.  Explicitly check whether NEVER is
used in combination with other options.
Accept ORCPT parameter.
Remove dead code.
Merge pull request #327 from snimmagadda/cleanup

Cleanup