Remove legacy workarounds.