Removed unused code

Change-Id: I5f634572964417c31fc3b5282151a138c62925b3