Delete unused code
CC-5487 : Calendar won't load under certain situation with linked shows
Merge branch '2.5.x'