Cleanup tool (26/35)

Cleanup tool