Simplify parameter removal.
release/0.3.2