Cleanup tool (19/35)

Cleanup tool