Get rid of not-quite-singleton before someone uses it - potential issue around reboot