cleanup a few loose ends