Batch fix of warnings

Mostly unused variables

Change-Id: I14a810e11c75ca08604bd6409cc103b212a90936
Merge branch 'RemoveWarnings'

* RemoveWarnings:
  Batch fix of warnings

Change-Id: I1e1b3a82e7373e3fb276ce8242a6828ac74a3bd2