Remove unused globals

Change-Id: I7d13ed61925c6736bd367750e6b016b035d3c2f9