Yes.  Cleanup like this was not part of the pull request; wanted to get some review / sign-off on the high-level vision before coding to this level. Sounds like the vision/design is good, so glad to work on these types of issues!