Removed maruku dependency
language tweaks