Cleanup unused calendar stuff

Closes #53