[IMP-dev] clustering - code consolidation