Remove helper functions (replaced by c.l functions)