Remove some flags that are unused in the shim