[hoppa_liza]

Removing the date criteria is significant change to the codebase and will eventually require more testing. This might not work well with budget and deadlines.