Cleaning up some locale related stuff.  remove dependency on English.