Remove more leftovers