Remove a few more leftovers.