Cleaning up loose ends