cleaning up loose ends