More fixes for the public API and remove non-existing things.