Remove more workarounds.