Remove unused globals

These were missed in I4a87a7007f4adc2ab47be1207f1a04a5ccd31323

Change-Id: I1fc0435c1cd359a30cb1a9f5f07ebadd6e14bcf1