loose ends cleanup