Cleanup with new tool