AUI-1160 Don't generate unused options

Not sure who should I send this to.
Someone please review and merge this.
@natecavanaugh @eduardolundgren @brunobasto