ace: code cleanup

Change-Id: Idd71ca21435ec28bbdd80d2c66a9441ff7e46039