Cleanup tool (21/35)

Cleanup tool