Revert "prepare different statistics recording to make sure we don't forget anything"

This reverts commit 53fa7c89215437830099a6f79a95a5f3138a4195.