Use proper cleanup tools