Remove helper function requirement