Comment out reporting on resource usage, some cleanups