Cleaning up unused variables in the global space

Bug 47514

Change-Id: I97727c8a53c31b6f3d2f6f1a35a84a0c5e456568