Remove gproc.
Add better instrumentation.