BUG-1416 clean up flow statistic models