Clean up public entrypoints