Put old PBJ redundancy removal code back in