remove workarounds for fixed bugs