Remove reports stats + Refacto