Let's clean up the public API some more