What 'cl functions are in use here? I think we should remove their usages instead.