remove unused flags

Change-Id: I78296f441d59b8856fcdb9a6af77fb7fbc70f7ef