Remove workarounds