Removed old NSDate code, so hopefully the new solution will work.