Took care of the deprecated Calendar Stuff?

Maybe? We’ll have to see.