more neon optimizations - clean up

Change-Id: Ia604fc815b4277bdccf824f1fe5fe81c4c8d036d