taking out ndm dev dependency for now
cosmetic changes to services