Remove various bits of dead code and unused workarounds.

Test: treehugger
Change-Id: I68fcd5da304d04ff4da3c3f3712fb79ce6b5791e
(cherry picked from commit f63926a5c2f3f505eac8c081bad679ddfaeaba98)
7 files changed