Merge "Remove various bits of dead code and unused workarounds."