Got rid of clique internal iterator and next function
Fixed reliance on unmerged patch