Remove further leftovers.