Cleaning up unused variables in the global space

Bug 47514

Change-Id: I0b9ae384355ef42d5a503ea5f6073d0ba9fa973d
Merge " Cleaning up unused variables in the global space"