Leftovers from API change