Fixed default language and removed old code