Cleaning up unused variables in the global space

Bug 47514

Change-Id: I99bf3796f0e238d5a2bee8450d55345b6eb11a6f