Deleting unused code

Change-Id: I970b6ae64c7559cd3cbf9664f1921b92414b5e30
3 files changed