Remove the other workarounds