remove commented code
use helpers for dates