CAcorrect: drop legacy code