Removing unnecessary globals

Change-Id: I7b21b8db08f1bdc62da293ee472994602dcff348