Removing some unneeded code.

Change-Id: Ifef2e1af0af9b07b0f3730b545af9e0dd8ea71d3