Cleanup tool (10/35)

Cleanup tool