Bit more netconf cleanup...