remove vestigial code
tweaks to npa_wght calculation