are you planning to do this in the current PR or to keep it for the subsequent cleanup ?