This PR removes dead code that was responsible for timestamp management. This codepath is no longer used so removing it will reduce the diff.