@alcaeus Can you tell us more about this code removal? It does not look like it is related to the goal of this PR.