remove unneeded workarounds