removed unnecessary timezone code