Remove some more leftovers