Remove unused globals

Remove unused global variables from constants.

Change-Id: Ieb07007592bb9682ccd92a596ce6b2acea22ff69