Remove hwa optimizations

Change-Id: Ie8c8853176fd08fc48eb342c628c7125fbfb6ef6