Make simplification optional