Removing dead code

Change-Id: I712144b0beb81387efd4c4b59087594e9832d116
5 files changed