remove lock on reboot and shutdown
minor changes