Tool cleanup