remove some flags

Change-Id: I45b2ba4c8b629072e49c10d3fdeab0af576dd9ab