Cleaning out unused lines of code

Change-Id: I558248c9e1ccf8098220b110709d2a0cba9247ea
3 files changed