Disconnect old ND system, cleanup instrumentation file a bit