Remove unused globals

Change-Id: Id1c27653650f1d60892a9fddf4f6fa5dd534615f
Merge "Remove unused globals"