Remove some more leftovers.