Switch to nmanager and savannaclient