Clean up some of the timing analysis stuff.