Removed last parts of old + inefficent stats computation code