Re: [IMP-dev] clustering - code consolidation