Remove canonical goal duplication