Remove some obsolete options