Cuckold hubi clean up