Remove traces of list() functionality