These variables are not used anymore.
This patch removes them.

Change-Id: Id8035412a4f30b1b297acd71cda1d4eff61f5399