Remove some leftovers from the previous approach.