Clean up some loose ends.