Adding timing instrumentation
Revert "Adding timing instrumentation"

This reverts commit 113566a2763125651e89b170d10ad8d0da7890c9.