Clean-up some more extra things.