Remove progress hack, problems with replay