Clean up public API