Completely remove statistics and fix tests