Some cleanups (because of removal of replay code)