Removed unusued variables to clean the code.

Change-Id: I96d2f84cab88490f04af98603fba58325fa391fe