Removed unused variables

Change-Id: Iee3ae450996ae125e65f9e4c0dd4cc42128fdf63