Cleaned up restart, reboot and upgrade.