[Tools] Cleanup