Modelbase changes - remove the CalenderBook