does these belong in this pull request?