Clean up old Calendar cruft