fixed bug with cluster containment
removed clustering in basic code