Cleanup tool (20/35)

Cleanup tool