Bring everything in a sane state again.
Revert "Add Custom Timings to various points"