Cleanup unnecessary functions
Convert average stats from float to bigdecimal