Fix locale switch
Remove unused JS code