Revert "Revert "Remove Calendar controller""

This reverts commit 831860050c3a2dc11829a2a9870bf333f4424aae.