Removes shutdown hook during normal stop, preventing leaks
Merge pull request #1269 from digitalstain/remove-server-hook

Remove server hook