Remove unneeded and/or duplicate globals

Change-Id: I36879792865c1c272a83163a3c84cb5ba59781da