Cleanup & coordination with Locales