Clean up calendar
Add basic calendar hourly scheduling support