Merge pull request #6 from onox/master

Small RAAS update
Disconnect old ND system, cleanup instrumentation file a bit