fix race condition when creating a new report

+ drop old code