remove commented code
add locale