add cleanup tools