remove Calendar dependency