Remove unused globals

Change-Id: I55c1b147608ac79372998cb93bd9c9ecf31d97bf