Removed remaining locale stuff