Clean up public interfaces