Revert "Fix reboots problem & cleanup"

This reverts commit e48f3574d44fa73c149ef3489c5d8ee07bdbbc4e.