Removing dead code

Change-Id: Iec1e23a9764b8ef2bb1326c8502f31f5b5c8763a
13 files changed