Remove empty_options flag