Clean up some known leftovers.