Removed references to timepicker