Cleanup tool (33/35)

Cleanup tool