- [IOS-1706] Refactor cleanup.