Took out unnecessary date stuff