Remove some debug statements and add some timers.