Cleaning up loose ends.