Cleanup tool (27/35)

Cleanup tool