Cleaning up unused variables in the global space

Bug 47514

Change-Id: I30712b873badae98d977908c53a0d04ac0a44078