clean up calendar
move date-rules into separate file