remove some ancient workarounds