Cleanup tool (3/35)

Cleanup tool