Cleanup tool (16/35)

Cleanup tool