Delete dead code

Test: NA
Bug: NA
Change-Id: I5044909883053dc47726ef6d3d1702995115c556
2 files changed