Remove wrong
Remove unused instrumentation
Add runtime instrumentation
Tweak EM instrumentation
Threads :neckbeard: