Minor cleanup: unused vars, annotations

Change-Id: I750bdb11d25a6b79aab3676c3e6b9f420378bdec
Merge "Minor cleanup: unused vars, annotations"