Max&Michal: another clean-up in dates