Remove old and unsupported options