Remove unsued options
Minor edit
Minor edit