Remove optional flags

Related to #738