Removing unused code

Change-Id: I6eee2a6c9b9aa313a6ec16ad7ea28c075d1939a4
3 files changed