Clean up items to remove

Lots of this stuff became unneeded after we stopped screen-scraping.
Improves performance a tiny bit.
We should remove more selectors, this commit removes only a 100% safe set.

Change-Id: If8e3cc9262a87a7085b3883dfb20fa4ff6b6001c
Merge "Clean up items to remove"