Remove unused methods and simplify statement

This is a non-functional refactor.

Bug: 205124386
Test: Presubmit.
Flag: EXEMPT refactor
Change-Id: I796a99b0f417ff3f72c707d94e110c8783ef5dcd
1 file changed