delete old pmi reweighting
and extra refacts..