Safe cleanup