Cuckold cleanup

Cuckold cleanup