Cleanup flags

Change-Id: Ia79cd62cdb578f534079f30cefa1f81e2fcb58a6