locale fix attempt
Upgraded version and removed old code