Staging

@eric79 @kadst43 

Removed instrumentation and lots of editor changes.