Hygiene: Remove hardcoded removals from ExtractFormatter

Also address FIXME now cache has had time to clear

Change-Id: I29ac95cd041991ca424784a0e15d5f37d33a923a
Merge "Hygiene: Remove hardcoded removals from ExtractFormatter"