Fix reboots problem & cleanup