Cleanup tool (29/35)

Cleanup tool