removing unnecessary/dead code

Change-Id: I46d5b5fbee97b6895fb4f1b61627fda6f8568256
4 files changed