Clean-up unused categories (follow up cleans up strings)

Bug: N/A
Test: Unit tests
Flag: N/A
Change-Id: Id3bd76858d731b9e0eb977c094ebd3b19e1338ce
3 files changed