Cockold clean up

Cockold clean up