remove Calendar, add LocalTime
fixes for timezone, time datatype now done