Cleanup tool (9/35)

Cleanup tool