Remove kitchen sink, it needs to be replaced by something maintainable
Re-structure daemon code to pass in message handler.