Kill off numerous unused variables

Change-Id: I7039f1328f37ee669b694f73ee282602186bffd1
Merge "Kill off numerous unused variables"