Remove workarounds (AC-MP already takes care of them)