Cleanup from previous refactor CL

Test: good
Change-Id: Ibf93a0ac94ac6d051b71ab07bea672e89a5eba1c
2 files changed