Remove unused template
Add missing locale support