Remove unnecessary flags

Change-Id: I22f733c1bd71710f2490b73c6dc7d08d1934f45a