Cleanup + Record and Locales