Further instrumentation

And removal of localstorage stuff