cleaned up calendar api