Remove unnecessary globals.

Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
4 files changed