Remove unused globals

Change-Id: I9c6a8dfe13ad3b757c81a048274d1daf9409d4c9