Remove extra options