Fix regression for predefined dates
Remove state from timepicker