CMS-3520 Elastic node / service cleanup

NodeDao as service