#162 #163 Remove the option