Remove references to flags no longer supported