Cleanup flag and unused method

Bug: 266831522
Test: TH
Change-Id: I4bed3ceea5ce20facf1f234fdb6d74b3aae93c46
2 files changed