Remove hard coded dates