remove temporary workarounds