Remove old language switcher; simplify servlet structure