Get rid of unnecessary options