Move out old unused stats, fixes #24