Remove deprecated cl