Get rid of empty flags

Change-Id: Ied63dfeea525cdcafd6e2aac422dd87743a5dada