Removed forced list context where all() is already used