Remove optionality and reexport enabling features