Remove guard dependencies
Use a string comparsion for locale parameters