Remove some workarounds.