Clean up flags

Change-Id: I126e944eebebf901f622cac1301eeed9f8114074