Re-enable helpers
Simplify locale