Removing some state params, issue #231.