Removed dead code

Change-Id: I3f42ce77e460db2da06ed28e281a60793e09f296