refactor
adding removing date