some flags removed

Change-Id: If40b279fc0e4125dff75e6dd76db34c2ba16c421