Get rid of unnecessary DATE usage