Remove unnecessary options handling