Revert "Add some timers to the calls."

This reverts commit 18e6a6dacbf104c851dc9e951491eff99f4239d7.
Merge branch 'develop'