armani: code cleanup

Change-Id: I48e0a1311e2afe72d261fcf98dc457b1d21534e6