Clean-up unused code

Test: presubmit + manual
Bug: n/a
Change-Id: I5532d8feb3889159a73b35d3bc9d017e5b28c98c
1 file changed