Remove helper function call and requirement