Removing flags that won't be used in the first release