remove unnecessary flags

Change-Id: I414b8f44b9f081315c9b8723eb3d9eaebaba6e51