more family and listen cleanup