Removed extra locale files (and fixed mere conflicts)