minor change to start supporting cleanup of timestamps