Remove EmpiricalWeighted, as almost never used and a bit of an anomaly.