remove obsolete switches coming from an incorrect merge