removed unneeded code

Change-Id: Ic274720ca70a45d5336f1b3eac089941aa8b3c10