Remove the Timestamp + Timestamp method.

Update the interval mappings with batchID -> Timestamp, update test to cover it