Localization Cleanup

Closes #543