Fixed missing cleanup
Moved things around
Merge pull request #693 from nurupo/dht_bootstrap_daemon

Fixed missing cleanup