CONTRIB-4429 Fix conflict with other blocks, tidy code and remove non-English languages