Merge "Entrypoints cleanup."