Removed locale code - Very buggy on deployment server