[PLXCOMP-234] Remove useless options

Patch by James Henderson, rebased/realigned to current master