removing yet unneeded code.

Change-Id: I55584a6cfbc5ab41ec82eeec64aaca8b86fe2174