Remove CA workarounds