Merge "Remove dead code related to shutdown hooks."