Utils - remove functools dependency