Adapt toggle(), clean some config parameters