Clean-up of treatment of weights