cuckold cleanup

cuckold cleanup on avbox.