remove unnecessary flags

Change-Id: I81faaeac70c8bb08d35d0078b623d15e729aded8