Cockold cleans up

Cockold cleans up