Remove some old flags

Change-Id: I176f43f70d5546c67789059a219aaaf37d033a89