Remove unneeded options