Removed unnecessary timezone handling, it was complicating things without providing any advantage