removed legacy remaining_options reference