Remove more leftovers.