If there's something that shouldn't be public, by all means, let's get rid of it in another PR!