armani: code cleanup

Change-Id: I2b2fcad68b4a6efab1fe00d225d38886bf1c23e8