calendar v2 tweaks/cleanup