Clean redudant date related code