do not use O3

Change-Id: I16ce01fda669d1923c5b271f2d772f5ac2c0f2ec
add and delete some tweaks

Change-Id: I3cfe2b886a4a6788074a1efd391ba55f7063cf78