Cleanup tool (15/35)

Cleanup tool