Cuckold clean up

Cuckold clean up