Removed calendarid and replaced with thermostat