Move the shutdown hook out of crawler and into command