Changed some files and removed some lang files