Change date duplication and remove dead commented code
clean code