Clean up for `option` module