These variables are not used and were recently accidentally re-added. Change-Id: If15b24a0cc7b7a6b6d3abeab5899ef90d5c6fe80