Remove unused globals

Change-Id: I6bb89eb2002be1a761356fb85ad69bc24ee2a085