Cleanup and localization for UCP