Remove globals unneeded after 47d1060

Change-Id: I39b6fa829e0d6ea7861b06edd8f5c599edcf4b76
Merge "Remove globals unneeded after 47d1060"