Cleanup and Localization Work