remove optional features from inside other features. if they're optional, then wtf? why include them? Signed-off-by: nickboldt <nboldt@redhat.com>