Cleaned up additional timing tracing