PROV-524 Remove old code