Remove some more workarounds.