Remove additions to deprecated global variable that are not in use anyway

Change-Id: Id832245e4d75864efc6a7f9bde6528ce968a412b
Merge "Remove additions to deprecated global variable that are not in use anyway"