Clean up calendar identifier logic