Remove helper functions