Remove now unneeded dependency on calendar