Updated Locales, removed unused code and commented the functions used