Cleaned up calendar/Config update with restart