Remove the set options.  Make the passing of options a little simpler.