QC: Remove an old TODO
Restructure the replay code