Removed TODO comment.
Removed a few traces of transition_timestamp.