clean_up the options