Clean up some useless code

Bug: 191606414
Test: manual
Change-Id: Ibc763fe3860fae17b31824cead2c3ea0697adb35
1 file changed