remove workarounds not needed anymore