Remove various bits of dead code and unused workarounds.

Test: treehugger
Change-Id: I68fcd5da304d04ff4da3c3f3712fb79ce6b5791e
(cherry picked from commit 61fb2936f1142cb18c33ccc7e47360989605d6ce)
1 file changed