Cuckhold clean up

Cuckhold clean up