Make datepicker optional