Cleanup: remove unused variables

Reported on macosx with -Wunused-variable

Change-Id: I27902945944ca862162b375bf39f0aca03300690